Skip to content

Commit c83a861

Browse files
committed
Merge branch 'release-v5.2.12'
2 parents f804925 + c787f83 commit c83a861

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

.github/workflows/main.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ jobs:
8383
- name: Set up QEMU
8484
uses: docker/setup-qemu-action@master
8585
with:
86-
platforms: amd64,arm,arm64
86+
platforms: amd64,arm64
87+
# ignore arm/v7 (32bit) because unsupported by "cryptography" dep of
88+
# Ansible and demand seems unlikely
8789

8890
- name: Set up Docker BuildKit
8991
id: buildx
@@ -100,6 +102,17 @@ jobs:
100102
with:
101103
context: . # build context is workspace so we can copy artifacts from ./dist/
102104
builder: ${{ steps.buildx.outputs.name }}
103-
platforms: linux/amd64,linux/arm/v7,linux/arm64
105+
platforms: linux/amd64,linux/arm64
104106
push: true
105107
tags: ${{ steps.compose_tags.outputs.container_tags }}
108+
109+
- name: Build & Push Multi-Platform Container Image to Hub
110+
if: github.event.action == 'published'
111+
uses: docker/build-push-action@v2
112+
with:
113+
context: . # build context is workspace so we can copy artifacts from ./dist/
114+
file: Dockerfile.demo
115+
builder: ${{ steps.buildx.outputs.name }}
116+
platforms: linux/amd64,linux/arm64
117+
push: true
118+
tags: netfoundry/python:demo

Dockerfile.demo

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM netfoundry/python
2+
ARG network_name=BibbidiBobbidiBoo
3+
ENV NETWORK_NAME=${network_name}
4+
CMD python3 -m netfoundry.demo --network ${NETWORK_NAME}

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ else:
4848

4949
[![Video Tour of Release Procedure](https://img.youtube.com/vi/RlIa2mv8YIM/0.jpg)](https://youtu.be/RlIa2mv8YIM)
5050

51+
```
5152
00:00 Welcome Pythonistas
5253
00:50 Determine next version number
5354
01:30 GitFlow Release Start
@@ -63,4 +64,5 @@ else:
6364
10:30 GitHub Create Release
6465
12:00 Verify Published Artifacts in PyPi and Hub
6566
12:30 PyPi Upgrade Gets New Version
66-
13:30 Docker Run Check Version
67+
13:30 Docker Run Check Version
68+
```

0 commit comments

Comments
 (0)