Skip to content

Commit

Permalink
GHA: Add dispatch option to the docker build action
Browse files Browse the repository at this point in the history
  • Loading branch information
quartje committed Jun 22, 2023
1 parent 11eeb8a commit 5cac999
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: build-push-docker-image
on:
push:
branches: feature/docker_configs
workflow_dispatch:

jobs:
build-push-docker-image:
Expand Down
2 changes: 1 addition & 1 deletion config/legacy/parameters.yaml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ parameters:
# - management - user "management"
# - GDPR compliance: deprovision and retrieval of user information - user "lifecycle"
selfservice_api_password: sa_secret
registration_authority_api_password: ra_sacret
registration_authority_api_password: ra_secret
readonly_api_password: secret
management_password: secret
lifecycle_password: secret
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
COPY *.tar.bz2 /tmp/
RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
rm -rf /tmp/*.tar.bz2
rm -rf /tmp/*.tar.bz2

# Add the application configuration files
COPY .env .env
COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml.dist
COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml

# Add the config files for Apache2
RUN rm -rf /etc/apache2/sites-enabled/*
Expand Down
2 changes: 1 addition & 1 deletion docker/conf/middleware-apache2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ServerAdmin [email protected]

DocumentRoot /var/www/html/public

SetEnv HTTPS on
SetEnv APP_ENV prod
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1

Expand Down

0 comments on commit 5cac999

Please sign in to comment.