From da202201c513e4f8fa360bf74e20d43f8d83d477 Mon Sep 17 00:00:00 2001 From: Simon Beginn Date: Mon, 13 Sep 2021 11:13:48 +0200 Subject: [PATCH] Removed fresh code cloning from building (use the local cahced version instead) --- .github/workflows/main.yml | 4 ++-- docker/README.md | 2 ++ docker/docker-py3-kms-minimal/Dockerfile | 5 ++--- docker/docker-py3-kms/Dockerfile | 6 ++---- docker/docker-py3-kms/build-py3-kms.sh | 2 +- docker/docker-py3-kms/run-py3-kms.sh | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 docker/README.md diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9649b41..f1b995e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: - name: Build uses: docker/build-push-action@v2 with: - context: ./docker/docker-py3-kms/ + context: . file: ./docker/docker-py3-kms/Dockerfile platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6 push: true @@ -46,7 +46,7 @@ jobs: - name: Build uses: docker/build-push-action@v2 with: - context: ./docker/docker-py3-kms-minimal/ + context: . file: ./docker/docker-py3-kms-minimal/Dockerfile platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6 push: true diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..56263c7 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,2 @@ +Both docker files must access the source code of this repository. Therefore the build context must be the root of the project directory. +Take a look into the build script for the normal py-kms version, as it demonstrates exactly that case and how to use these docker files. diff --git a/docker/docker-py3-kms-minimal/Dockerfile b/docker/docker-py3-kms-minimal/Dockerfile index a5b9e72..2fd9768 100644 --- a/docker/docker-py3-kms-minimal/Dockerfile +++ b/docker/docker-py3-kms-minimal/Dockerfile @@ -14,6 +14,8 @@ ENV LOGLEVEL INFO ENV LOGFILE /var/log/pykms_logserver.log ENV LOGSIZE "" +COPY ./py-kms /home/py-kms + RUN apk add --no-cache --update \ bash \ git \ @@ -25,9 +27,6 @@ RUN apk add --no-cache --update \ py3-pip \ build-base python3-dev && \ pip3 install peewee tzlocal && \ - git clone https://github.com/Py-KMS-Organization/py-kms.git /tmp/py-kms && \ - mv /tmp/py-kms/py-kms /home/ && \ - rm -rf /tmp/py-kms && \ apk del git build-base python3-dev WORKDIR /home/py-kms diff --git a/docker/docker-py3-kms/Dockerfile b/docker/docker-py3-kms/Dockerfile index e42865f..e98a808 100644 --- a/docker/docker-py3-kms/Dockerfile +++ b/docker/docker-py3-kms/Dockerfile @@ -13,7 +13,8 @@ ENV LOGLEVEL ERROR ENV LOGFILE /var/log/pykms_logserver.log ENV LOGSIZE "" -COPY start.sh /usr/bin/start.sh +COPY docker/docker-py3-kms/start.sh /usr/bin/start.sh +COPY ./py-kms /home/py-kms RUN apk add --no-cache --update \ bash \ @@ -25,11 +26,8 @@ RUN apk add --no-cache --update \ sqlite-libs \ py3-pip \ build-base python3-dev && \ - git clone https://github.com/Py-KMS-Organization/py-kms.git /tmp/py-kms && \ git clone https://github.com/coleifer/sqlite-web.git /tmp/sqlite_web && \ - mv /tmp/py-kms/py-kms /home/ && \ mv /tmp/sqlite_web/sqlite_web /home/ && \ - rm -rf /tmp/py-kms && \ rm -rf /tmp/sqlite_web && \ pip3 install peewee tzlocal pysqlite3 && \ chmod a+x /usr/bin/start.sh && \ diff --git a/docker/docker-py3-kms/build-py3-kms.sh b/docker/docker-py3-kms/build-py3-kms.sh index d671d4a..71e6145 100755 --- a/docker/docker-py3-kms/build-py3-kms.sh +++ b/docker/docker-py3-kms/build-py3-kms.sh @@ -1 +1 @@ -docker build -t pykms/pykms:py3-kms . --file Dockerfile +docker build -t pykms/pykms:py3-kms ../../ --file ./Dockerfile diff --git a/docker/docker-py3-kms/run-py3-kms.sh b/docker/docker-py3-kms/run-py3-kms.sh index a98e5d4..b8d5f4c 100755 --- a/docker/docker-py3-kms/run-py3-kms.sh +++ b/docker/docker-py3-kms/run-py3-kms.sh @@ -13,4 +13,4 @@ docker run -d --name py3-kms \ -e LOGSIZE=2 \ -v /etc/localtime:/etc/localtime:ro \ -v /var/log:/var/log:rw \ - --restart unless-stopped pykmsorg/py-kms:python3 + --restart unless-stopped pykms/pykms:py3-kms