Skip to content

Commit

Permalink
dbeaver/dbeaver devops#1201 base java image (#2642)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
serge-rider and mayerro authored May 20, 2024
1 parent eaf19cf commit 7cd22a8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
11 changes: 3 additions & 8 deletions deploy/docker/Dockerfile → deploy/docker/base-java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ FROM ubuntu:23.10

MAINTAINER DBeaver Corp, [email protected]

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 \
Expand Down Expand Up @@ -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"]
10 changes: 10 additions & 0 deletions deploy/docker/cloudbeaver-ce/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM dbeaver/base-java

MAINTAINER DBeaver Corp, [email protected]

COPY cloudbeaver /opt/cloudbeaver

EXPOSE 8978
RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
WORKDIR /opt/cloudbeaver/
ENTRYPOINT ["./run-server.sh"]
File renamed without changes.
2 changes: 1 addition & 1 deletion deploy/docker/make-docker-container.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 7cd22a8

Please sign in to comment.