From ac6755517baf64fec762adbeb04b4ddac86a1a16 Mon Sep 17 00:00:00 2001 From: saundersp <pierre.saundersgb@gmail.com> Date: Wed, 1 May 2024 13:36:08 +0200 Subject: [PATCH] Simplified docker building --- .dockerignore | 6 ------ Dockerfile | 18 +++++------------- docker-compose.yaml | 4 ++++ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 .dockerignore create mode 100644 docker-compose.yaml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 797167d..0000000 --- a/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -.ccls-cache -.git -bin -Dockerfile -LICENCE -README.md diff --git a/Dockerfile b/Dockerfile index cc4f087..4eeb068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,13 @@ FROM alpine:3.19.1 -RUN apk add make g++ +RUN apk add --no-cache make=4.4.1-r2 g++=13.2.1_git20231014-r0 \ + && adduser --disabled-password saundersp + +USER saundersp WORKDIR /home/saundersp/sorting_algorithms -RUN adduser \ - --disabled-password \ - --gecos '' \ - --home "$(pwd)" \ - --no-create-home \ - saundersp - -COPY . . - -RUN chown -R saundersp /home/saundersp/sorting_algorithms - -USER saundersp +COPY *.cpp *.hpp Makefile ./ RUN make -j "$(nproc)" diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..f2b08f5 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,4 @@ +services: + sorting_algorithms: + image: saundersp/sorting_algorithms + build: .