Skip to content

Commit 1541612

Browse files
committed
contrib: move context to repository root, use additional context for copy
1 parent 5149e42 commit 1541612

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

contrib/containers/guix/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ RUN usermod -aG sudo ${USERNAME} && \
7474
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
7575

7676
# Copy required files to container
77-
COPY ./motd.txt /etc/motd
78-
COPY ./scripts/entrypoint /usr/local/bin/entrypoint
79-
COPY ./scripts/guix-check /usr/local/bin/guix-check
80-
COPY ./scripts/guix-start /usr/local/bin/guix-start
77+
COPY --from=docker_root ./motd.txt /etc/motd
78+
COPY --from=docker_root ./scripts/entrypoint /usr/local/bin/entrypoint
79+
COPY --from=docker_root ./scripts/guix-check /usr/local/bin/guix-check
80+
COPY --from=docker_root ./scripts/guix-start /usr/local/bin/guix-start
8181

8282
# Create directory for mounting and grant necessary permissions
8383
RUN mkdir -p /src/dash && \

contrib/containers/guix/docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ version: "3.9"
22
services:
33
guix_ubuntu:
44
build:
5-
context: '.'
6-
dockerfile: './Dockerfile'
5+
context: '../../..'
6+
additional_contexts:
7+
- docker_root=.
8+
dockerfile: './contrib/containers/guix/Dockerfile'
79
args:
810
USER_ID: 1000 # set this to $(id -u) of the host
911
GROUP_ID: 1000 # set this to $(id -g) of the host

0 commit comments

Comments
 (0)