Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: fix docker #795

Merged
merged 12 commits into from
Jul 11, 2023
Merged

build: fix docker #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df0aad9
add buildx to docker builds
Jul 7, 2023
07e3542
fix upload step
gzukel Jul 8, 2023
3151187
Merge branch 'develop' into fix-build
gzukel Jul 8, 2023
7b15e1e
fix docker build kit
gzukel Jul 8, 2023
4253da0
Merge branch 'develop' into fix-build
kingpinXD Jul 8, 2023
590e28b
stash
gzukel Jul 10, 2023
0e404ab
adjust the build kit steps
gzukel Jul 10, 2023
8d5dd7d
Merge branch 'develop' into fix-build
gzukel Jul 10, 2023
ada263d
fix smoke test
gzukel Jul 10, 2023
123f30f
fix smoke test with double docker sign
gzukel Jul 10, 2023
74fadf2
reverting back to zeta runners.
gzukel Jul 11, 2023
2885b59
reverting back to zeta runners.
gzukel Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/actions/build-docker-images/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ runs:
using: "composite"

steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Set Environment Variables"
run: |
echo "DOCKER_FILENAME=${{ inputs.DOCKER_FILENAME }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -54,4 +51,4 @@ runs:
run: |
docker build -f $DOCKER_FILENAME -t $ECR_REGISTRY/$REPOSITORY_NAME:$IMAGE_TAG -t $GHCR_REGISTRY/$REPOSITORY_NAME:$IMAGE_TAG .
# docker push $ECR_REGISTRY/$REPOSITORY_NAME:$IMAGE_TAG
docker push $GHCR_REGISTRY/$REPOSITORY_NAME:$IMAGE_TAG
docker push $GHCR_REGISTRY/$REPOSITORY_NAME:$IMAGE_TAG
23 changes: 7 additions & 16 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ jobs:
zetaclientd-alpine-*

smoke-test:
# runs-on: ["zeta-runners"]
runs-on: ubuntu-latest
runs-on: ["zeta-runners"]
#runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -243,21 +243,18 @@ jobs:
docker compose down

upload:
# runs-on: ["zeta-runners"]
runs-on: ubuntu-latest
runs-on: ["zeta-runners"]
#runs-on: ubuntu-latest

timeout-minutes: 15
if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop')
needs:
- build-and-test
# - smoke-test
- smoke-test
- build-alpine-and-test
steps:
- uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: setup-git-credentials
uses: de-vri-es/setup-git-credentials@v2.0.8
with:
Expand Down Expand Up @@ -302,10 +299,6 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Check Binaries
run: |
ls -lah

- name: upload-files-to-s3
uses: ./.github/actions/upload-to-s3
with:
Expand Down Expand Up @@ -363,8 +356,6 @@ jobs:
zetacored-ubuntu-20-amd64
zetaclientd-ubuntu-20-amd64



upgrade_path_testing:
runs-on: ["buildjet-4vcpu-ubuntu-2204"]
timeout-minutes: 60
Expand Down Expand Up @@ -392,8 +383,8 @@ jobs:
echo "The major version found in 'releaseVersion' in app/setup_handlers.go matches this tagged release - Moving Forward!"

upload_s3_public:
runs-on: ubuntu-latest
# runs-on: ["zeta-runners"]
#runs-on: ubuntu-latest
runs-on: ["zeta-runners"]
timeout-minutes: 15
if: startsWith(github.ref, 'refs/tags/')
needs:
Expand Down
2 changes: 1 addition & 1 deletion contrib/localnet/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ services:
-regtest=1
-rpcallowip=172.20.0.0/16
-rpcbind=0.0.0.0
-rpcauth=smoketest:63acf9b8dccecce914d85ff8c044b78b$5892f9bbc84f4364e79f0970039f88bdd823f168d4acc76099ab97b14a766a99
-rpcauth=smoketest:63acf9b8dccecce914d85ff8c044b78b$$5892f9bbc84f4364e79f0970039f88bdd823f168d4acc76099ab97b14a766a99
-txindex=1

orchestrator:
Expand Down