Skip to content

Commit

Permalink
Docker build process changed to support shared files
Browse files Browse the repository at this point in the history
  • Loading branch information
mynttt committed May 22, 2020
1 parent 5a67cb6 commit be6067a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion updatetool-docker/build → build-docker
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion updatetool-docker-32bit/build → build-docker-32bit
Original file line number Diff line number Diff line change
@@ -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
Empty file modified docker-shared/bootstrap.sh
100644 → 100755
Empty file.
Empty file modified docker-shared/entry.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions updatetool-docker-32bit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
ENTRYPOINT /usr/app/entry.sh
4 changes: 2 additions & 2 deletions updatetool-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
ENTRYPOINT /usr/app/entry.sh

0 comments on commit be6067a

Please sign in to comment.