From 70be2d93ce015940f07fdc4c05a7c228042b141f Mon Sep 17 00:00:00 2001 From: Gernot Nusshall <gernot.nusshall@rise-world.com> Date: Wed, 13 Nov 2019 13:45:05 +0100 Subject: [PATCH 1/3] cleaner startup exec in order to build the image and run the container with podman/libpod --- docker/amd64/sqlite/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index 30f15614..be0c5374 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -94,4 +94,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] +WORKDIR / +CMD ["/bitwarden_rs"] From 204993568a11c1f303b2dc60ff8471f96a23a26c Mon Sep 17 00:00:00 2001 From: Gernot Nusshall <gernot.nusshall@rise-world.com> Date: Wed, 13 Nov 2019 21:45:26 +0100 Subject: [PATCH 2/3] cleaner startup exec in order to build the image and run the container with podman/libpod --- docker/aarch64/mysql/Dockerfile | 3 ++- docker/aarch64/sqlite/Dockerfile | 3 ++- docker/amd64/mysql/Dockerfile | 3 ++- docker/amd64/postgresql/Dockerfile | 3 ++- docker/armv6/mysql/Dockerfile | 3 ++- docker/armv6/sqlite/Dockerfile | 3 ++- docker/armv7/mysql/Dockerfile | 3 ++- docker/armv7/sqlite/Dockerfile | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index d719a96d..d648af17 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -103,4 +103,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index 9315775d..5558fa91 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -102,4 +102,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index cae8de27..3dae604e 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -100,4 +100,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile index 1ccbba77..c607bfac 100644 --- a/docker/amd64/postgresql/Dockerfile +++ b/docker/amd64/postgresql/Dockerfile @@ -101,4 +101,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 2230d1ac..54ab795a 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -103,4 +103,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 4445b2e0..7f19ec8a 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -102,4 +102,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index 0a0e3ea2..4dcf9499 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -104,4 +104,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index 7a10c0bc..a22ebac6 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -102,4 +102,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] From 748c82520213dacb957e9994942f415970e19d13 Mon Sep 17 00:00:00 2001 From: Gernot Nusshall <gernot.nusshall@rise-world.com> Date: Wed, 13 Nov 2019 22:11:09 +0100 Subject: [PATCH 3/3] cleaner startup exec in order to build the image and run the container with podman/libpod --- docker/amd64/mysql/Dockerfile.alpine | 3 ++- docker/amd64/postgresql/Dockerfile.alpine | 3 ++- docker/amd64/sqlite/Dockerfile.alpine | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index ad7df060..e7e1f782 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -82,4 +82,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine index 16938ee5..e2faec08 100644 --- a/docker/amd64/postgresql/Dockerfile.alpine +++ b/docker/amd64/postgresql/Dockerfile.alpine @@ -83,4 +83,5 @@ COPY docker/healthcheck.sh ./healthcheck.sh HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] \ No newline at end of file +WORKDIR / +CMD ["/bitwarden_rs"] diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index e54881bc..1687dfb9 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -77,4 +77,5 @@ HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! -CMD ["./bitwarden_rs"] +WORKDIR / +CMD ["/bitwarden_rs"]