diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/android-dockerimage.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/linux-dockerimage.yml | 20 |
2 files changed, 26 insertions, 14 deletions
diff --git a/.github/workflows/android-dockerimage.yml b/.github/workflows/android-dockerimage.yml index c5cdf5154..91af87363 100644 --- a/.github/workflows/android-dockerimage.yml +++ b/.github/workflows/android-dockerimage.yml @@ -9,7 +9,7 @@ jobs: android-build-container: runs-on: ubuntu-latest env: - VERSION: 5.13.01 + VERSION: ${{ '5.13.01' }} steps: - uses: actions/checkout@v1 @@ -21,10 +21,16 @@ jobs: sed -ie 's/^sudo/#sudo/' setup-docker.sh bash setup-docker.sh - - name: Build the Docker image - run: docker build ./scripts/docker/android-build-container/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} - - - name: Push the Docker image + - name: set env run: | - docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} - docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/android-build-container:${VERSION} + v=${{ env.VERSION }} + echo "::set-env name=NAME::subsurface/android-build-container:${v}" + + - name: Build and Publish Linux Docker image to Dockerhub + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: ${{ env.NAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + dockerfile: 'Dockerfile' + workdir: './scripts/docker/android-build-container/' diff --git a/.github/workflows/linux-dockerimage.yml b/.github/workflows/linux-dockerimage.yml index 857ed5f5a..25894aa35 100644 --- a/.github/workflows/linux-dockerimage.yml +++ b/.github/workflows/linux-dockerimage.yml @@ -10,7 +10,7 @@ jobs: trusty-qt512: runs-on: ubuntu-latest env: - VERSION: 0.7 + VERSION: ${{ '0.7' }} # just assigning a number wouldn't get you a string steps: - uses: actions/checkout@v1 @@ -20,10 +20,16 @@ jobs: cd scripts/docker/trusty-qt512 bash getpackages.sh - - name: Build the Docker image - run: docker build ./scripts/docker/trusty-qt512/ --tag docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} - - - name: Push the Docker image + - name: set env run: | - docker login docker.pkg.github.com -u ${GITHUB_REPOSITORY/\/*/} -p ${{ secrets.GITHUB_TOKEN }} - docker push docker.pkg.github.com/${GITHUB_REPOSITORY,,}/trusty-qt512:${VERSION} + v=${{ env.VERSION }} + echo "::set-env name=NAME::subsurface/trusty-qt512:${v}" + + - name: Build and Publish Linux Docker image to Dockerhub + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: ${{ env.NAME }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + dockerfile: 'Dockerfile' + workdir: './scripts/docker/trusty-qt512/' |