From 1c1e5b1da89876f9fe93922025e7bb095eede21a Mon Sep 17 00:00:00 2001 From: Ino Murko Date: Thu, 15 Jul 2021 13:35:53 +0200 Subject: [PATCH 1/4] create release images --- .github/workflows/omgx-publish-master.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/omgx-publish-master.yml b/.github/workflows/omgx-publish-master.yml index 35bf2afddacf..aeb70b4117bb 100644 --- a/.github/workflows/omgx-publish-master.yml +++ b/.github/workflows/omgx-publish-master.yml @@ -49,17 +49,16 @@ jobs: - name: Build the services working-directory: ./ops run: | - echo ${{ steps.tag.outputs.VERSION }} ./scripts/build-ci.sh - docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:${{ steps.tag.outputs.VERSION }} - docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:${{ steps.tag.outputs.VERSION }} - docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:${{ steps.tag.outputs.VERSION }} + docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:${{ steps.tag.outputs.result }} + docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:${{ steps.tag.outputs.result }} + docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:${{ steps.tag.outputs.result }} - name: Rename and retag the Optimism images working-directory: ./ops run: | for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep ethereumoptimism); do - docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):${{ steps.tag.outputs.VERSION }} + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):${{ steps.tag.outputs.result }} done docker rmi $(docker images | grep 'ethereumoptimism/' | awk '{print $1}') docker images From 6ff3b1393fb591eb5533287a110b69de499c6e14 Mon Sep 17 00:00:00 2001 From: Ino Murko Date: Thu, 15 Jul 2021 13:39:32 +0200 Subject: [PATCH 2/4] create containers for develop and add gas-oracle create containers for develop and add gas-oracle --- .github/workflows/omgx-publish-master.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/omgx-publish-master.yml b/.github/workflows/omgx-publish-master.yml index aeb70b4117bb..35bf2afddacf 100644 --- a/.github/workflows/omgx-publish-master.yml +++ b/.github/workflows/omgx-publish-master.yml @@ -49,16 +49,17 @@ jobs: - name: Build the services working-directory: ./ops run: | + echo ${{ steps.tag.outputs.VERSION }} ./scripts/build-ci.sh - docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:${{ steps.tag.outputs.result }} - docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:${{ steps.tag.outputs.result }} - docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:${{ steps.tag.outputs.result }} + docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:${{ steps.tag.outputs.VERSION }} + docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:${{ steps.tag.outputs.VERSION }} + docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:${{ steps.tag.outputs.VERSION }} - name: Rename and retag the Optimism images working-directory: ./ops run: | for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep ethereumoptimism); do - docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):${{ steps.tag.outputs.result }} + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):${{ steps.tag.outputs.VERSION }} done docker rmi $(docker images | grep 'ethereumoptimism/' | awk '{print $1}') docker images From ae4d7ada0c82940cdea432adff2db19259687139 Mon Sep 17 00:00:00 2001 From: Ino Murko Date: Thu, 15 Jul 2021 14:35:59 +0200 Subject: [PATCH 3/4] filter tag --- .github/workflows/omgx-publish-develop.yml | 4 ++-- .github/workflows/omgx-publish-master.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/omgx-publish-develop.yml b/.github/workflows/omgx-publish-develop.yml index 84eaf79677a2..626e45aef282 100644 --- a/.github/workflows/omgx-publish-develop.yml +++ b/.github/workflows/omgx-publish-develop.yml @@ -53,8 +53,8 @@ jobs: working-directory: ./ops run: | for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep ethereumoptimism); do - docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):latest - docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):develop + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):latest + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):develop done docker image tag omgx/gas-oracle:latest omgx/gas-oracle:develop diff --git a/.github/workflows/omgx-publish-master.yml b/.github/workflows/omgx-publish-master.yml index 35bf2afddacf..81671a44eee2 100644 --- a/.github/workflows/omgx-publish-master.yml +++ b/.github/workflows/omgx-publish-master.yml @@ -59,7 +59,7 @@ jobs: working-directory: ./ops run: | for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep ethereumoptimism); do - docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}'):${{ steps.tag.outputs.VERSION }} + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):${{ steps.tag.outputs.VERSION }} done docker rmi $(docker images | grep 'ethereumoptimism/' | awk '{print $1}') docker images From bd4abcaf32a21ae4dd96d61b9c88ce7d5dd14aa7 Mon Sep 17 00:00:00 2001 From: Ino Murko Date: Thu, 15 Jul 2021 15:50:46 +0200 Subject: [PATCH 4/4] filter tag, and build omgx_message-relayer-fast --- .github/workflows/omgx-publish-develop.yml | 9 +++++---- .github/workflows/omgx-publish-master.yml | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/omgx-publish-develop.yml b/.github/workflows/omgx-publish-develop.yml index 626e45aef282..36fba024be2a 100644 --- a/.github/workflows/omgx-publish-develop.yml +++ b/.github/workflows/omgx-publish-develop.yml @@ -48,18 +48,19 @@ jobs: docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:latest docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:latest docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:latest - + docker build ../ --file docker/Dockerfile.omgx_message-relayer-fast --tag omgx/omgx_message-relayer-fast:latest - name: Rename and retag the optimism images working-directory: ./ops run: | + for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep omgx); do + docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):develop + done + for i in $(docker images --format "{{.Repository}}:{{.Tag}}" | grep ethereumoptimism); do docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):latest docker image tag "$i" omgx/$(echo $i | awk -F'/' '{print $2}' | awk -F':' '{print $1}'):develop done - docker image tag omgx/gas-oracle:latest omgx/gas-oracle:develop - docker image tag omgx/omgx_builder:latest omgx/omgx_builder:develop - docker image tag omgx/omgx_deployer:latest omgx/omgx_deployer:develop docker rmi $(docker images | grep 'ethereumoptimism/' | awk '{print $1}') docker images diff --git a/.github/workflows/omgx-publish-master.yml b/.github/workflows/omgx-publish-master.yml index 81671a44eee2..7613f419a751 100644 --- a/.github/workflows/omgx-publish-master.yml +++ b/.github/workflows/omgx-publish-master.yml @@ -46,15 +46,17 @@ jobs: id: tag run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + - name: Print current tag + run: echo ${{ steps.tag.outputs.VERSION }} + - name: Build the services working-directory: ./ops run: | - echo ${{ steps.tag.outputs.VERSION }} ./scripts/build-ci.sh docker build ../ --file docker/Dockerfile.omgx_monorepo --tag omgx/omgx_builder:${{ steps.tag.outputs.VERSION }} docker build ../ --file docker/Dockerfile.omgx_deployer --tag omgx/omgx_deployer:${{ steps.tag.outputs.VERSION }} docker build ../ --file docker/Dockerfile.gas-oracle --tag omgx/gas-oracle:${{ steps.tag.outputs.VERSION }} - + docker build ../ --file docker/Dockerfile.omgx_message-relayer-fast --tag omgx/omgx_message-relayer-fast:${{ steps.tag.outputs.VERSION }} - name: Rename and retag the Optimism images working-directory: ./ops run: | @@ -63,6 +65,7 @@ jobs: done docker rmi $(docker images | grep 'ethereumoptimism/' | awk '{print $1}') docker images + docker images | grep ${{ steps.tag.outputs.VERSION }} - name: Rename and retag the optimism images working-directory: ./ops