Skip to content

Commit

Permalink
Adding the dev container. Fixing up the prod Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
danakim committed Jun 19, 2023
1 parent 10653e4 commit e2a8f61
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .github/workflows/build-push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ jobs:
ghcr.io/openconext/stepup-middleware/stepup-middleware:prod
ghcr.io/openconext/stepup-middleware/stepup-middleware:${{ github.sha }}
ghcr.io/openconext/stepup-middleware/stepup-middleware:${{ steps.release.outputs.tag_name }}
- name: Build and push the Development image
uses: docker/build-push-action@v4
with:
context: .
file: docker/Dockerfile.dev
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/openconext/stepup-middleware/stepup-middleware:dev
10 changes: 10 additions & 0 deletions docker/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2-node14-composer2:latest

RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./docker/conf/middleware-apache2.conf /etc/apache2/sites-enabled/middleware.conf
EXPOSE 80

# Set the default workdir
WORKDIR /var/www/html

CMD ["apache2-foreground"]
2 changes: 1 addition & 1 deletion docker/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \

# 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

0 comments on commit e2a8f61

Please sign in to comment.