Skip to content

Commit 47dad7d

Browse files
authored
Merge pull request #2 from PatternAtlas/feature/adapt-ports
Feature/adapt ports
2 parents 1d9e03f + 4bdd68c commit 47dad7d

File tree

2 files changed

+48
-2
lines changed

2 files changed

+48
-2
lines changed

.github/workflows/dockerhub.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Push docker images to Dockerhub
2+
3+
on:
4+
push:
5+
branches: master
6+
tags:
7+
- "v*.*.*"
8+
9+
jobs:
10+
multi:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
- name: Set up QEMU
16+
uses: docker/setup-qemu-action@v1
17+
- name: Set output
18+
id: vars
19+
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@v1
22+
- name: Login to DockerHub
23+
uses: docker/login-action@v1
24+
with:
25+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
26+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
27+
28+
- name: Build and push latest Pattern Atlas UI
29+
if: ${{ steps.vars.outputs.tag == 'master' }}
30+
uses: docker/build-push-action@v2
31+
with:
32+
context: .
33+
push: true
34+
tags: patternatlas/pattern-atlas-db:latest
35+
36+
- name: Build and push version of Pattern Atlas UI
37+
if: ${{ steps.vars.outputs.tag != 'master' }}
38+
uses: docker/build-push-action@v2
39+
with:
40+
context: .
41+
push: true
42+
tags: patternatlas/pattern-atlas-db:${{ steps.vars.outputs.tag }}

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV SUBFOLDER_CONTENT_REPO_BACKUP_FILES "db-backup-files"
99
ENV COPY_CONTENT_REPOSITORY_TARGET_PATH "/var/pattern-atlas/testdata"
1010
ENV POSTGRES_PASSWORD postgres
1111
ENV POSTGRES_USER postgres
12-
ENV JDBC_DATABASE_PORT 5432
12+
ENV JDBC_DATABASE_PORT 5060
1313
ENV POSTGRES_DB db
1414

1515
# install dependencies (git)
@@ -19,7 +19,11 @@ RUN apt-get update \
1919
&& apt-get clean \
2020
&& rm -rf /var/lib/apt/lists/*
2121

22+
EXPOSE 5060
23+
2224
COPY clone-data-repo.sh clone-data-repo.sh
2325

2426
# if ssh key is set, clone data repo with the sql scripts for initalization and start postgres afterwards
25-
CMD chmod 700 clone-data-repo.sh && ./clone-data-repo.sh && su postgres -c "/usr/local/bin/docker-entrypoint.sh postgres"
27+
CMD chmod 700 clone-data-repo.sh \
28+
&& ./clone-data-repo.sh \
29+
&& su postgres -c "/usr/local/bin/docker-entrypoint.sh postgres -p ${JDBC_DATABASE_PORT}"

0 commit comments

Comments
 (0)