Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/integration' into
Browse files Browse the repository at this point in the history 
HSP-6724-sormas-1-96-0
  • Loading branch information
@fhauptmann
fhauptmann committed Apr 25, 2024
2 parents ca6936b + 8239d40 commit cd1dcc1
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ SORMAS_POSTGRES_USER=sormas_user

SORMAS_DOCKER_VERSION=2.57.0-rc1
SORMAS_VERSION=1.96.0

# only needed for CI build systems
SORMAS_DEMIS_VERSION=1.42.0

Expand Down
1 change: 0 additions & 1 deletion apache2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ FROM httpd:2.4-alpine
ARG SORMAS_SERVER_URL
ARG SORMAS_VERSION=1.96.0


ENV SORMAS_VERSION=$SORMAS_VERSION
ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/

Expand Down
2 changes: 0 additions & 2 deletions letsencrypt/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ FROM lsiobase/nginx:3.11

ARG CERTBOT_VERSION=1.3.0
ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/

ARG SORMAS_VERSION=1.96.0


ENV SORMAS_VERSION=$SORMAS_VERSION
LABEL maintainer="aptalca"

Expand Down
3 changes: 0 additions & 3 deletions sormas/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ ARG MAIL_FROM=sormas@localhost
ARG JVM_MAX=4096m
ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
EXPOSE 6080

ARG SORMAS_VERSION=1.96.0


ENV SORMAS_VERSION=$SORMAS_VERSION

ENV MAIL_FROM=root@localhost
Expand Down

0 comments on commit cd1dcc1

Please sign in to comment.