From 7cd22a84c2f792f22303bf36b6223dd7207b26e5 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Mon, 20 May 2024 16:44:25 +0200 Subject: [PATCH] dbeaver/dbeaver devops#1201 base java image (#2642) * dbeaver/dbeaver-devops#1201 Base Java image * dbeaver/dbeaver-devops#1201 Fix scripts * dbeaver/dbeaver-devops#1201 hilevel default env var --------- Co-authored-by: mayerro --- deploy/docker/{ => base-java}/Dockerfile | 11 +++-------- deploy/docker/cloudbeaver-ce/Dockerfile | 10 ++++++++++ deploy/docker/{ => cloudbeaver-ce}/docker-compose.yml | 0 deploy/docker/make-docker-container.sh | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) rename deploy/docker/{ => base-java}/Dockerfile (88%) create mode 100644 deploy/docker/cloudbeaver-ce/Dockerfile rename deploy/docker/{ => cloudbeaver-ce}/docker-compose.yml (100%) diff --git a/deploy/docker/Dockerfile b/deploy/docker/base-java/Dockerfile similarity index 88% rename from deploy/docker/Dockerfile rename to deploy/docker/base-java/Dockerfile index 0a110689fa..3d6522ffb1 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/base-java/Dockerfile @@ -2,9 +2,11 @@ FROM ubuntu:23.10 MAINTAINER DBeaver Corp, devops@dbeaver.com +ENV DEBIAN_FRONTEND=noninteractive + RUN set -eux; \ apt-get update; \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + apt-get install -y --no-install-recommends \ # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 curl \ wget \ @@ -43,10 +45,3 @@ RUN set -eux; \ ### Patch java security COPY java.security* ${JAVA_HOME}/conf/security/java.security - -COPY cloudbeaver /opt/cloudbeaver - -EXPOSE 8978 -RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \; -WORKDIR /opt/cloudbeaver/ -ENTRYPOINT ["./run-server.sh"] diff --git a/deploy/docker/cloudbeaver-ce/Dockerfile b/deploy/docker/cloudbeaver-ce/Dockerfile new file mode 100644 index 0000000000..361df92c0a --- /dev/null +++ b/deploy/docker/cloudbeaver-ce/Dockerfile @@ -0,0 +1,10 @@ +FROM dbeaver/base-java + +MAINTAINER DBeaver Corp, devops@dbeaver.com + +COPY cloudbeaver /opt/cloudbeaver + +EXPOSE 8978 +RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \; +WORKDIR /opt/cloudbeaver/ +ENTRYPOINT ["./run-server.sh"] diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/cloudbeaver-ce/docker-compose.yml similarity index 100% rename from deploy/docker/docker-compose.yml rename to deploy/docker/cloudbeaver-ce/docker-compose.yml diff --git a/deploy/docker/make-docker-container.sh b/deploy/docker/make-docker-container.sh index 17f869b3e4..f38c98d2a1 100755 --- a/deploy/docker/make-docker-container.sh +++ b/deploy/docker/make-docker-container.sh @@ -1,3 +1,3 @@ cd .. -docker build -t dbeaver/cloudbeaver:dev . --file ./docker/Dockerfile +docker build -t dbeaver/cloudbeaver:dev . --file ./docker/cloudbeaver-ce/Dockerfile