diff --git a/.github/workflows/docker-image-Laravel.yml b/.github/workflows/docker-image-Laravel.yml index 3f76299..7b93a89 100644 --- a/.github/workflows/docker-image-Laravel.yml +++ b/.github/workflows/docker-image-Laravel.yml @@ -22,10 +22,6 @@ jobs: with: image: Laravel tags: latest - - # If you don't have a Dockerfile/Containerfile, refer to https://github.com/redhat-actions/buildah-build#scratch-build-inputs - # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build - # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root. dockerfiles: | ./openshift/openshift.dockerfile - name: Push to registry diff --git a/.github/workflows/docker-image-Nginx.yml b/.github/workflows/docker-image-Nginx.yml index affab86..f6cfed7 100644 --- a/.github/workflows/docker-image-Nginx.yml +++ b/.github/workflows/docker-image-Nginx.yml @@ -10,13 +10,9 @@ on: branches: [ "master", "develop", "feature/da_opschonen" ] pull_request: branches: [ "master" ] - jobs: - build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: Build the Docker image @@ -24,11 +20,7 @@ jobs: uses: redhat-actions/buildah-build@v2 with: image: Nginx - tags: ${{ env.IMAGE_TAGS }} - - # If you don't have a Dockerfile/Containerfile, refer to https://github.com/redhat-actions/buildah-build#scratch-build-inputs - # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build - # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root. + tags: latest dockerfiles: | ./openshift/nginx.dockerfile - name: Push to registry diff --git a/openshift/openshift.dockerfile b/openshift/openshift.dockerfile index aaf888b..c71e690 100644 --- a/openshift/openshift.dockerfile +++ b/openshift/openshift.dockerfile @@ -33,7 +33,7 @@ RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/lo RUN composer install -COPY ./docker/openshift.env /var/www/.env +COPY ./openshift/openshift.env /var/www/.env RUN chmod -R a+rw /var/www/storage RUN php artisan key:generate