Commit d769d0c

authored

added buildx setup in workflows, fixed an issue in the build container script (#39)

1 parent f394b66 commit d769d0cCopy full SHA for d769d0c

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ jobs:`
`27`	`27`	`username: ${{ secrets.DOCKERHUB_USERNAME }}`
`28`	`28`	`password: ${{ secrets.DOCKERHUB_TOKEN }}`
`29`	`29`
	`30`	`+ - name: Set up QEMU`
	`31`	`+ uses: docker/setup-qemu-action@v3`
	`32`	`+`
	`33`	`+ - name: Set up Docker Buildx`
	`34`	`+ uses: docker/setup-buildx-action@v3`
	`35`	`+`
`30`	`36`	`- name: Build & Push Stable Docker`
`31`	`37`	`uses: docker/build-push-action@v5`
`32`	`38`	`with:`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -140,14 +140,22 @@ jobs:`
`140`	`140`	`username: ${{ secrets.DOCKERHUB_USERNAME }}`
`141`	`141`	`password: ${{ secrets.DOCKERHUB_TOKEN }}`
`142`	`142`
	`143`	`+ - name: Set up QEMU`
	`144`	`+ uses: docker/setup-qemu-action@v3`
	`145`	`+`
	`146`	`+ - name: Set up Docker Buildx`
	`147`	`+ uses: docker/setup-buildx-action@v3`
	`148`	`+`
`143`	`149`	`- name: Build & Push Docker Preview`
`144`	`150`	`if: steps.verify_package.outputs.success == 'true'`
`145`	`151`	`uses: docker/build-push-action@v5`
`146`	`152`	`env:`
`147`	`153`	`VERSION: ${{ env.VERSION }}`
`148`	`154`	`with:`
`149`	`155`	`push: true`
`150`		`- tags: socketdev/cli:pr-${{ github.event.pull_request.number }}`
	`156`	`+ platforms: linux/amd64,linux/arm64`
	`157`	`+ tags: \|`
	`158`	`+ socketdev/cli:pr-${{ github.event.pull_request.number }}`
`151`	`159`	`build-args: \|`
`152`	`160`	`CLI_VERSION=${{ env.VERSION }}`
`153`	`161`	`PIP_INDEX_URL=https://test.pypi.org/simple`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,12 @@ jobs:`
`66`	`66`	`username: ${{ secrets.DOCKERHUB_USERNAME }}`
`67`	`67`	`password: ${{ secrets.DOCKERHUB_TOKEN }}`
`68`	`68`
	`69`	`+ - name: Set up QEMU`
	`70`	`+ uses: docker/setup-qemu-action@v3`
	`71`	`+`
	`72`	`+ - name: Set up Docker Buildx`
	`73`	`+ uses: docker/setup-buildx-action@v3`
	`74`	`+`
`69`	`75`	`- name: Verify package is installable`
`70`	`76`	`id: verify_package`
`71`	`77`	`env:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ if [ $ENABLE_PYPI_BUILD = "pypi-build=test" ]; then`
`26`	`26`	`python -m build --wheel --sdist`
`27`	`27`	`twine upload --repository testpypi dist/$VERSION`
`28`	`28`	`sleep 120`
`29`		`- docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:$VERSION . \`
`30`		`- && docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:latest . \`
	`29`	`+ docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:$VERSION-test . \`
	`30`	`+ && docker build --no-cache --build-arg CLI_VERSION=$VERSION --platform linux/amd64,linux/arm64 -t socketdev/cli:test . \`
`31`	`31`	`&& docker push socketdev/cli:$VERSION-test \`
`32`	`32`	`&& docker push socketdev/cli:test`
`33`	`33`	`fi`

Comments

(0)