From d2841578a6fcae55152dd01884c99050316e5eb0 Mon Sep 17 00:00:00 2001 From: Tom Reinders Date: Tue, 20 Sep 2022 10:41:26 +0200 Subject: [PATCH 1/3] TD-470 Move to new docker repo --- .github/workflows/build.yaml | 17 +++++++++-------- README.md | 8 ++++---- src/index.ts | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5fc70df..0cd706e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,6 +3,7 @@ on: push: branches: - main + - feature/TD-470 # TODO: Remove temp branch workflow_dispatch: schedule: - cron: '0 12 * * 1' @@ -13,12 +14,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: - - '^(7\.4)(\.\d+)?-apache$' - - '^(8\.0)(\.\d+)?-apache$' - - '^(8\.1)(\.\d+)?-apache$' - - '^(7\.4)(\.\d+)?-fpm$' - - '^(8\.0)(\.\d+)?-fpm$' + php: # TODO: Undo temp comments +# - '^(7\.4)(\.\d+)?-apache$' +# - '^(8\.0)(\.\d+)?-apache$' +# - '^(8\.1)(\.\d+)?-apache$' +# - '^(7\.4)(\.\d+)?-fpm$' +# - '^(8\.0)(\.\d+)?-fpm$' - '^(8\.1)(\.\d+)?-fpm$' steps: - name: Setup multi-architecture support @@ -29,8 +30,8 @@ jobs: - name: Login to registry uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.DOCKER_USERNAME_TEMP }} # TODO: replace temp secret + password: ${{ secrets.DOCKER_PASSWORD_TEMP }} # TODO: replace temp secret - name: Yarn install run: yarn - name: Yarn start diff --git a/README.md b/README.md index 1df2a89..1976802 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build](https://github.com/recognizegroup/symfony-docker/actions/workflows/build.yaml/badge.svg)](https://github.com/recognizegroup/symfony-docker/actions/workflows/build.yaml) # symfony-docker -Docker image made to run symfony application. Check https://hub.docker.com/r/recognizebv/symfony-docker +Docker image made to run symfony application. Check https://hub.docker.com/r/recognizegroup/symfony-docker ## Available variants - php7.4, php8.0, php8.1 (PHP Version) @@ -12,7 +12,7 @@ Docker image made to run symfony application. Check https://hub.docker.com/r/rec example: php8.1-node16-image-dev -[All tags](https://hub.docker.com/r/recognizebv/symfony-docker/tags) +[All tags](https://hub.docker.com/r/recognizegroup/symfony-docker/tags) ## What's here? @@ -35,7 +35,7 @@ You can you this docker-compose.yml file to develop: ``` www: - image: recognizebv/symfony-docker:php8.0-dev + image: recognizegroup/symfony-docker:php8.0-dev volumes: - ".:/var/www/html" ports: @@ -70,7 +70,7 @@ path: "php://stderr" You can build production ready image with dockerfile like this: ``` -FROM recognizebv/symfony-docker:php8.0 +FROM recognizegroup/symfony-docker:php8.0 ADD . /var/www/html # Add your application build steps here, for example: # RUN ./var/www/html/web/bin/... diff --git a/src/index.ts b/src/index.ts index 2b3146b..64f6f42 100644 --- a/src/index.ts +++ b/src/index.ts @@ -96,7 +96,7 @@ async function buildImages(docker: Docker, phpVersion: PhpVersion, nodeVersions: } async function buildAndPushImage(docker: Docker, phpVersion: PhpVersion, nodeVersion: NodeVersion, imageSupport: boolean, debug: boolean) { - const imageName = 'recognizebv/symfony-docker'; + const imageName = 'recognizegroup/symfony-docker'; const tagSuffix = `${phpVersion.webServer === WebServerType.NGINX ? '-nginx' : ''}-node${nodeVersion.major}` + (imageSupport ? '-image' : '') + (debug ? '-dev' : ''); const exactTagName = `php${phpVersion.exactVersion}${tagSuffix}` const tagName = `php${phpVersion.version}${tagSuffix}` From 674871e9b778107ed260c653595c45f9739ed5ba Mon Sep 17 00:00:00 2001 From: Tom Reinders Date: Tue, 20 Sep 2022 11:50:10 +0200 Subject: [PATCH 2/3] TD-470 Build all php versions --- .github/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0cd706e..1417231 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: # TODO: Undo temp comments -# - '^(7\.4)(\.\d+)?-apache$' -# - '^(8\.0)(\.\d+)?-apache$' -# - '^(8\.1)(\.\d+)?-apache$' -# - '^(7\.4)(\.\d+)?-fpm$' -# - '^(8\.0)(\.\d+)?-fpm$' + php: + - '^(7\.4)(\.\d+)?-apache$' + - '^(8\.0)(\.\d+)?-apache$' + - '^(8\.1)(\.\d+)?-apache$' + - '^(7\.4)(\.\d+)?-fpm$' + - '^(8\.0)(\.\d+)?-fpm$' - '^(8\.1)(\.\d+)?-fpm$' steps: - name: Setup multi-architecture support From 7afae82eec5e158e0b0805df374e28c2a4e40e1b Mon Sep 17 00:00:00 2001 From: Tom Reinders Date: Tue, 20 Sep 2022 13:27:20 +0200 Subject: [PATCH 3/3] TD-470 Remove temp branch and change back docker username and password secret names --- .github/workflows/build.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1417231..5fc70df 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,6 @@ on: push: branches: - main - - feature/TD-470 # TODO: Remove temp branch workflow_dispatch: schedule: - cron: '0 12 * * 1' @@ -30,8 +29,8 @@ jobs: - name: Login to registry uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME_TEMP }} # TODO: replace temp secret - password: ${{ secrets.DOCKER_PASSWORD_TEMP }} # TODO: replace temp secret + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Yarn install run: yarn - name: Yarn start