From be6067a6f9b9a1d929af0408257b798b4fd2b050 Mon Sep 17 00:00:00 2001 From: Marc Herschel Date: Fri, 22 May 2020 18:29:57 +0200 Subject: [PATCH] Docker build process changed to support shared files --- updatetool-docker/build => build-docker | 2 +- updatetool-docker-32bit/build => build-docker-32bit | 2 +- docker-shared/bootstrap.sh | 0 docker-shared/entry.sh | 0 updatetool-docker-32bit/Dockerfile | 4 ++-- updatetool-docker/Dockerfile | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename updatetool-docker/build => build-docker (69%) rename updatetool-docker-32bit/build => build-docker-32bit (69%) mode change 100644 => 100755 docker-shared/bootstrap.sh mode change 100644 => 100755 docker-shared/entry.sh diff --git a/updatetool-docker/build b/build-docker similarity index 69% rename from updatetool-docker/build rename to build-docker index 4239a87..0663d5d 100755 --- a/updatetool-docker/build +++ b/build-docker @@ -1,3 +1,3 @@ #!/bin/bash #Needs experimental features enabled and qemu support / a builder set up with arm included! -docker buildx build --platform linux/amd64,linux/arm64/v8 --no-cache -t mynttt/updatetool:latest . --push +docker buildx build --platform linux/amd64,linux/arm64/v8 --no-cache -t mynttt/updatetool:latest -f updatetool-docker/Dockerfile . --push diff --git a/updatetool-docker-32bit/build b/build-docker-32bit similarity index 69% rename from updatetool-docker-32bit/build rename to build-docker-32bit index 0f3fe7f..135fc6b 100755 --- a/updatetool-docker-32bit/build +++ b/build-docker-32bit @@ -1,3 +1,3 @@ #!/bin/bash #Needs experimental features enabled and qemu support / a builder set up with arm included! -docker buildx build --platform linux/arm/v7,linux/386 --no-cache -t mynttt/updatetool:32bit . --push +docker buildx build --platform linux/arm/v7,linux/386 --no-cache -t mynttt/updatetool:32bit -f updatetool-docker-32bit/Dockerfile . --push diff --git a/docker-shared/bootstrap.sh b/docker-shared/bootstrap.sh old mode 100644 new mode 100755 diff --git a/docker-shared/entry.sh b/docker-shared/entry.sh old mode 100644 new mode 100755 diff --git a/updatetool-docker-32bit/Dockerfile b/updatetool-docker-32bit/Dockerfile index a227729..287862d 100644 --- a/updatetool-docker-32bit/Dockerfile +++ b/updatetool-docker-32bit/Dockerfile @@ -2,8 +2,8 @@ FROM openjdk:11-jre-slim-stretch RUN apt-get update && apt-get install -y wget WORKDIR /usr/app -COPY ../docker-shared/*.sh /usr/app/ +COPY docker-shared/*.sh /usr/app/ RUN /usr/app/bootstrap.sh VOLUME /config WORKDIR /config -ENTRYPOINT /usr/app/entry.sh \ No newline at end of file +ENTRYPOINT /usr/app/entry.sh diff --git a/updatetool-docker/Dockerfile b/updatetool-docker/Dockerfile index 0d65a1b..391ef91 100644 --- a/updatetool-docker/Dockerfile +++ b/updatetool-docker/Dockerfile @@ -2,8 +2,8 @@ FROM openjdk:11-jre-slim RUN apt-get update && apt-get install -y wget WORKDIR /usr/app -COPY ../docker-shared/*.sh /usr/app/ +COPY docker-shared/*.sh /usr/app/ RUN /usr/app/bootstrap.sh VOLUME /config WORKDIR /config -ENTRYPOINT /usr/app/entry.sh \ No newline at end of file +ENTRYPOINT /usr/app/entry.sh