Skip to content

Commit

Permalink
Merge branch 'feat/fix-buildkit-env-var' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@clemlesne
clemlesne committed May 11, 2023
2 parents 8c56c0d + abdc834 commit 2c2f97e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions src/docker/Dockerfile-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,13 @@ ENV AZP_CUSTOM_CERT_PEM ${HOME}/azp-custom-certs
RUN rm arch.sh

# Configure local user
RUN mkdir -p /run/${USER}/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/${USER}/0 ${HOME} \
RUN mkdir -p /run/user/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/user/0 ${HOME} \
&& echo ${USER}:100000:65536 | tee /etc/subuid | tee /etc/subgid
USER 0:0
ENV XDG_RUNTIME_DIR=/run/${USER}/0
ENV XDG_RUNTIME_DIR=/run/user/0
ENV TMPDIR=${HOME}/.local/tmp
ENV BUILDKIT_HOST=unix:///run/${USER}/0/buildkit/buildkitd.sock
ENV BUILDKIT_HOST=unix:///run/user/0/buildkit/buildkitd.sock
VOLUME ${HOME}/.local/share/buildkit

# Install Azure Pipelines Agent startup script
Expand Down
8 changes: 4 additions & 4 deletions src/docker/Dockerfile-focal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ ENV AZP_CUSTOM_CERT_PEM ${HOME}/azp-custom-certs
RUN rm arch.sh

# Configure local user
RUN mkdir -p /run/${USER}/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/${USER}/0 ${HOME} \
RUN mkdir -p /run/user/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/user/0 ${HOME} \
&& echo ${USER}:100000:65536 | tee /etc/subuid | tee /etc/subgid
USER 0:0
ENV XDG_RUNTIME_DIR=/run/${USER}/0
ENV XDG_RUNTIME_DIR=/run/user/0
ENV TMPDIR=${HOME}/.local/tmp
ENV BUILDKIT_HOST=unix:///run/${USER}/0/buildkit/buildkitd.sock
ENV BUILDKIT_HOST=unix:///run/user/0/buildkit/buildkitd.sock
VOLUME ${HOME}/.local/share/buildkit

# Install Azure Pipelines Agent startup script
Expand Down
8 changes: 4 additions & 4 deletions src/docker/Dockerfile-jammy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ ENV AZP_CUSTOM_CERT_PEM ${HOME}/azp-custom-certs
RUN rm arch.sh

# Configure local user
RUN mkdir -p /run/${USER}/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/${USER}/0 ${HOME} \
RUN mkdir -p /run/user/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/user/0 ${HOME} \
&& echo ${USER}:100000:65536 | tee /etc/subuid | tee /etc/subgid
USER 0:0
ENV XDG_RUNTIME_DIR=/run/${USER}/0
ENV XDG_RUNTIME_DIR=/run/user/0
ENV TMPDIR=${HOME}/.local/tmp
ENV BUILDKIT_HOST=unix:///run/${USER}/0/buildkit/buildkitd.sock
ENV BUILDKIT_HOST=unix:///run/user/0/buildkit/buildkitd.sock
VOLUME ${HOME}/.local/share/buildkit

# Install Azure Pipelines Agent startup script
Expand Down
8 changes: 4 additions & 4 deletions src/docker/Dockerfile-ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@ ENV AZP_CUSTOM_CERT_PEM ${HOME}/azp-custom-certs
RUN rm arch.sh

# Configure local user
RUN mkdir -p /run/${USER}/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/${USER}/0 ${HOME} \
RUN mkdir -p /run/user/0 ${HOME}/.local/tmp ${HOME}/.local/share/buildkit \
&& chown -R ${USER} /run/user/0 ${HOME} \
&& echo ${USER}:100000:65536 | tee /etc/subuid | tee /etc/subgid
USER 0:0
ENV XDG_RUNTIME_DIR=/run/${USER}/0
ENV XDG_RUNTIME_DIR=/run/user/0
ENV TMPDIR=${HOME}/.local/tmp
ENV BUILDKIT_HOST=unix:///run/${USER}/0/buildkit/buildkitd.sock
ENV BUILDKIT_HOST=unix:///run/user/0/buildkit/buildkitd.sock
VOLUME ${HOME}/.local/share/buildkit

# Install Azure Pipelines Agent startup script
Expand Down

0 comments on commit 2c2f97e

Please sign in to comment.