Skip to content

Commit aa5406d

Browse files
authored
Merge pull request #3 from pwa-builder/dev
Upstream + custom target
2 parents 3f8da6d + 8bffe2f commit aa5406d

File tree

9 files changed

+577
-151
lines changed

9 files changed

+577
-151
lines changed

.dockerignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#.dockerignore
2+
3+
# Ignore all .md files, except README.md
4+
*.md
5+
!README.md
6+
7+
# Ignore the license
8+
LICENSE
9+
10+
# Ignore git
11+
.git
12+
13+
# Ignore Github Stuff
14+
.github
15+
16+
# Ignore test projects
17+
test_projects

.github/workflows/dockerimage.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
env:
1010
REGISTRY: pwabuilder.azurecr.io
1111
IMAGE_NAME: pwa-android-build-box
12+
TAG: master
1213

1314
jobs:
1415

@@ -41,9 +42,14 @@ jobs:
4142
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
4243
with:
4344
context: .
44-
push: true
45-
tags: ${{ steps.meta.outputs.tags }}
45+
push: false
46+
load: true
47+
platforms: linux/amd64
48+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }},${{ steps.meta.outputs.tags }}
4649
labels: ${{ steps.meta.outputs.labels }}
4750
cache-from: type=gha
4851
cache-to: type=gha,mode=max
49-
target: minimal-plus
52+
target: minimal-plus
53+
54+
- name: Push
55+
run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*.md
2+
!README.md
3+
4+
test_projects/
5+
6+
Gemfile
7+
.travis.yml

.travis.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)