pikvm/pi-builder
1
0
Fork 0
mirror of https://github.com/pikvm/pi-builder.git synced 2025-04-19 06:22:16 +03:00
Code

legacy ENV fix

Browse Source
This commit is contained in:
Maxim Devaev 2025-01-28 00:36:22 +00:00
parent 94c1acff5f
commit bb96d22738
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -222,7 +222,7 @@ _buildctx: | clean base qemu
|| sed -i -e 's|%COPY_QEMU_USER_STATIC%||g' $(_init)
for var in OS BOARD ARCH LOCALE TIMEZONE ARCH_DIST_REPO_URL ARCH_PIKVM_REPO_URL ARCH_PIKVM_REPO_KEY; do \
echo "ARG $$var" >> $(_init) \
&& echo "ENV $$var \$$$$var" >> $(_init) \
&& echo "ENV $$var=\$$$$var" >> $(_init) \
; done
#
echo -n > $(_BUILD_DIR)/Dockerfile

2
stages/arch/os/Dockerfile.part
View File

@ -2,7 +2,7 @@ RUN echo "$LOCALE.UTF-8 UTF-8" > /etc/locale.gen \
&& ([ "$LOCALE" = "en_US" ] || echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen) \
&& ([ "$LOCALE" = "C" ] || echo "C.UTF-8 UTF-8" >> /etc/locale.gen) \
&& locale-gen
ENV LC_ALL en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
RUN rm -f /etc/localtime \
&& ln -s "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime

2
stages/common/ssh-keygen/Dockerfile.part
View File

@ -1,5 +1,5 @@
ARG REBUILD
ENV REBUILD $REBUILD
ENV REBUILD=$REBUILD
RUN echo $REBUILD
RUN rm -f /etc/ssh/ssh_host_*_key* \
&& ssh-keygen -A

4
stages/rpios/os/Dockerfile.part
View File

@ -1,4 +1,4 @@
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
RUN echo "$LOCALE.UTF-8 UTF-8" > /etc/locale.gen \
&& ([ "$LOCALE" = "en_US" ] || echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen) \
@ -7,7 +7,7 @@ RUN echo "$LOCALE.UTF-8 UTF-8" > /etc/locale.gen \
&& update-locale LANG=$LOCALE.UTF-8 \
&& sed -i -e 's|\<gb\>|us|g' /etc/default/keyboard \
&& setupcon --force --save-only -v
ENV LC_ALL en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
RUN rm -f /etc/localtime \
&& ln -s "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime \

2
toolbox/Dockerfile.aarch64
View File

@ -7,7 +7,7 @@ RUN mkdir -p /etc/pacman.d/hooks \
RUN sed -i -e "s|^HOOKS=.*|HOOKS=(base udev block filesystems)|g" /etc/mkinitcpio.conf
ARG ARCH_DIST_REPO_URL
ENV ARCH_DIST_REPO_URL $ARCH_DIST_REPO_URL
ENV ARCH_DIST_REPO_URL=$ARCH_DIST_REPO_URL
RUN echo "Server = $ARCH_DIST_REPO_URL/\$arch/\$repo" > /etc/pacman.d/mirrorlist \
&& pacman-key --init \
&& pacman-key --populate archlinuxarm

2
toolbox/Dockerfile.arm
View File

@ -7,7 +7,7 @@ RUN mkdir -p /etc/pacman.d/hooks \
RUN sed -i -e "s|^HOOKS=.*|HOOKS=(base udev block filesystems)|g" /etc/mkinitcpio.conf
ARG ARCH_DIST_REPO_URL
ENV ARCH_DIST_REPO_URL $ARCH_DIST_REPO_URL
ENV ARCH_DIST_REPO_URL=$ARCH_DIST_REPO_URL
RUN echo "Server = $ARCH_DIST_REPO_URL/\$arch/\$repo" > /etc/pacman.d/mirrorlist \
&& pacman-key --init \
&& pacman-key --populate archlinuxarm