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

Jump to bottom

Improve devcontainer image build and push #2856

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Improve devcontainer image build and push #2856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d15f3bd
Move devcontainers into seperate directories
networkfusion Dec 27, 2023
c6b42ca
Use smoketests before PR.
networkfusion Dec 27, 2023
6b59f70
Improve the readme.
networkfusion Dec 27, 2023
dbc1311
Merge branch 'main' into devcontainer-structure-2
networkfusion Dec 27, 2023
ffdc630
Add NXP devcontainer
networkfusion Dec 27, 2023
6091ddf
Improve workflow publish
networkfusion Dec 27, 2023
e681524
Improve workflow
networkfusion Dec 27, 2023
6cbd79a
Improve GH workflow
networkfusion Dec 27, 2023
55820ac
Align container builds
networkfusion Dec 27, 2023
31c6cd9
Merge branch 'main' into devcontainer-structure-4
networkfusion Jan 17, 2024
379840f
Update devcontainer-freertos-nxp.yaml
networkfusion Jan 17, 2024
846c246
Merge branch 'main' into devcontainer-structure-4
networkfusion Mar 3, 2024
7c2a085
Merge branch 'main' into devcontainer-structure-4
networkfusion Mar 3, 2024
7da5cde
Merge branch 'main' into devcontainer-structure-4
networkfusion May 2, 2024
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
2 changes: 2 additions & 0 deletions .devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.01
LABEL org.website="https://nanoframework.net/"
LABEL description="This is dockerfile image for NXP targets"
21 changes: 13 additions & 8 deletions .github/workflows/devcontainer-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Build Dev Container for all platforms
env:
CONTAINER_REPO: ghcr.io
CONTAINER_NAME: dev-container-all
CONTAINER_SRC_FILE: .devcontainer/All/Dockerfile.All.SRC
CONTAINER_SOURCE_FILE: .devcontainer/All/Dockerfile.All.SRC
CONTAINER_VERSION_FILE: .devcontainer/All/Dockerfile.All

on:
push:
Expand All @@ -21,8 +22,11 @@ jobs:
build:
if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
runs-on: ubuntu-latest
steps:
permissions:
contents: read
packages: write

steps:
- name: Checkout Repository
uses: actions/checkout@v4

Expand All @@ -35,28 +39,29 @@ jobs:
large-packages: false

- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content(".devcontainer/All/Dockerfile.All")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

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

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: ${{ env.CONTAINER_REPO }}
username: ${{ github.repository_owner }}
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
file: ${{ env.CONTAINER_SRC_FILE }}
push: true # Will only build if this is not here
file: ${{ env.CONTAINER_SOURCE_FILE }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
21 changes: 13 additions & 8 deletions .github/workflows/devcontainer-azurertos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Build Dev Container for Azure RTOS
env:
CONTAINER_REPO: ghcr.io
CONTAINER_NAME: dev-container-azure-rtos
CONTAINER_SRC_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
CONTAINER_SOURCE_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
CONTAINER_VERSION_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS

on:
push:
Expand All @@ -21,8 +22,11 @@ jobs:
build:
if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:

- name: Checkout Repository
uses: actions/checkout@v4

Expand All @@ -35,28 +39,29 @@ jobs:
large-packages: false

- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content(".devcontainer/AzureRTOS/Dockerfile.AzureRTOS")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

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

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: ${{ env.CONTAINER_REPO }}
username: ${{ github.repository_owner }}
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
file: ${{ env.CONTAINER_SRC_FILE }}
push: true # Will only build if this is not here
file: ${{ env.CONTAINER_SOURCE_FILE }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/devcontainer-chibios.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Build Dev Container for ChibiOS
env:
CONTAINER_REPO: ghcr.io
CONTAINER_NAME: dev-container-chibios
CONTAINER_SRC_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
CONTAINER_SOURCE_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
CONTAINER_VERSION_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS

on:
push:
Expand All @@ -21,8 +22,11 @@ jobs:
build:
if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
runs-on: ubuntu-latest
steps:
permissions:
contents: read
packages: write

steps:
- name: Checkout Repository
uses: actions/checkout@v4

Expand All @@ -35,28 +39,29 @@ jobs:
large-packages: false

- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content(".devcontainer/ChibiOS/Dockerfile.ChibiOS")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

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

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: ${{ env.CONTAINER_REPO }}
username: ${{ github.repository_owner }}
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
file: ${{ env.CONTAINER_SRC_FILE }}
push: true # Will only build if this is not here
file: ${{ env.CONTAINER_SOURCE_FILE }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
16 changes: 9 additions & 7 deletions .github/workflows/devcontainer-esp32.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Build Dev Container for ESP32
env:
CONTAINER_REPO: ghcr.io
CONTAINER_NAME: dev-container-esp32
CONTAINER_SRC_FILE: .devcontainer/ESP32/Dockerfile.ESP32.SRC
CONTAINER_SOURCE_FILE: .devcontainer/ESP32/Dockerfile.ESP32.SRC
CONTAINER_VERSION_FILE: .devcontainer/ESP32/Dockerfile.ESP32

on:
push:
Expand Down Expand Up @@ -35,28 +36,29 @@ jobs:
large-packages: false

- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content(".devcontainer/ESP32/Dockerfile.ESP32")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

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

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: ${{ env.CONTAINER_REPO }}
username: ${{ github.repository_owner }}
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
file: ${{ env.CONTAINER_SRC_FILE }}
push: true # Will only build if this is not here
file: ${{ env.CONTAINER_SOURCE_FILE }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer-freertos-nxp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}") -First 1
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/devcontainer-ti.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ name: Build Dev Container for TI
env:
CONTAINER_REPO: ghcr.io
CONTAINER_NAME: dev-container-ti
CONTAINER_SRC_FILE: .devcontainer/TI/Dockerfile.TI.SRC
CONTAINER_SOURCE_FILE: .devcontainer/TI/Dockerfile.TI.SRC
CONTAINER_VERSION_FILE: .devcontainer/TI/Dockerfile.TI

on:
push:
Expand All @@ -21,8 +22,11 @@ jobs:
build:
if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
runs-on: ubuntu-latest
steps:
permissions:
contents: read
packages: write

steps:
- name: Checkout Repository
uses: actions/checkout@v4

Expand All @@ -35,28 +39,29 @@ jobs:
large-packages: false

- name: Get container version
shell: pwsh
run: |
$dockerfileContent = Get-Content(".devcontainer/TI/Dockerfile.TI")
$dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
$dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
$containerVersion = $Matches[0].ToString()
echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh

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

- name: Login to GitHub Container Registry
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
registry: ${{ env.CONTAINER_REPO }}
username: ${{ github.repository_owner }}
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
file: ${{ env.CONTAINER_SRC_FILE }}
push: true # Will only build if this is not here
file: ${{ env.CONTAINER_SOURCE_FILE }}
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
Loading