chore: explicitly supply arch to subcontainers.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
1fd69ecb37
commit
6f751db5b6
3 changed files with 41 additions and 23 deletions
56
.drone.yml
56
.drone.yml
|
@ -7,6 +7,10 @@ platform:
|
|||
os: linux
|
||||
arch: arm64
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
|
||||
steps:
|
||||
- name: dev-container/base
|
||||
image: plugins/docker
|
||||
|
@ -16,12 +20,13 @@ steps:
|
|||
from_secret: REGISTRY_TOKEN
|
||||
registry: harton.dev
|
||||
repo: harton.dev/james/dev-container/base
|
||||
cache_from: harton.dev/james/dev-container/base:latest-arm64
|
||||
context: ./base
|
||||
dockerfile: ./base/Dockerfile
|
||||
platform: linux/arm64
|
||||
pull: true
|
||||
auto_tag: true
|
||||
auto_tag_suffix: arm64
|
||||
tags:
|
||||
- latest-arm64
|
||||
|
||||
- name: dev-container/elixir
|
||||
image: plugins/docker
|
||||
|
@ -36,8 +41,10 @@ steps:
|
|||
context: ./elixir
|
||||
dockerfile: ./elixir/Dockerfile
|
||||
platform: linux/arm64
|
||||
auto_tag: true
|
||||
auto_tag_suffix: arm64
|
||||
pull: true
|
||||
build_args: "ARCH=arm64"
|
||||
tags:
|
||||
- latest-arm64
|
||||
|
||||
|
||||
- name: dev-container/rust
|
||||
|
@ -53,8 +60,10 @@ steps:
|
|||
context: ./rust
|
||||
dockerfile: ./rust/Dockerfile
|
||||
platform: linux/arm64
|
||||
auto_tag: true
|
||||
auto_tag_suffix: arm64
|
||||
pull: true
|
||||
build_args: "ARCH=arm64"
|
||||
tags:
|
||||
- latest-arm64
|
||||
|
||||
---
|
||||
|
||||
|
@ -66,6 +75,10 @@ platform:
|
|||
os: linux
|
||||
arch: amd64
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
|
||||
steps:
|
||||
- name: dev-container/base
|
||||
image: plugins/docker
|
||||
|
@ -75,12 +88,13 @@ steps:
|
|||
from_secret: REGISTRY_TOKEN
|
||||
registry: harton.dev
|
||||
repo: harton.dev/james/dev-container/base
|
||||
cache_from: harton.dev/james/dev-container/base:latest-amd64
|
||||
context: ./base
|
||||
dockerfile: ./base/Dockerfile
|
||||
platform: linux/amd64
|
||||
pull: true
|
||||
auto_tag: true
|
||||
auto_tag_suffix: amd64
|
||||
tags:
|
||||
- latest-amd64
|
||||
|
||||
- name: dev-container/elixir
|
||||
image: plugins/docker
|
||||
|
@ -95,8 +109,11 @@ steps:
|
|||
context: ./elixir
|
||||
dockerfile: ./elixir/Dockerfile
|
||||
platform: linux/amd64
|
||||
auto_tag: true
|
||||
auto_tag_suffix: amd64
|
||||
pull: true
|
||||
build_args: "ARCH=amd64"
|
||||
tags:
|
||||
- latest-amd64
|
||||
|
||||
|
||||
- name: dev-container/rust
|
||||
image: plugins/docker
|
||||
|
@ -111,8 +128,10 @@ steps:
|
|||
context: ./rust
|
||||
dockerfile: ./rust/Dockerfile
|
||||
platform: linux/amd64
|
||||
auto_tag: true
|
||||
auto_tag_suffix: amd64
|
||||
pull: true
|
||||
build_args: "ARCH=amd64"
|
||||
tags:
|
||||
- latest-amd64
|
||||
|
||||
---
|
||||
|
||||
|
@ -124,6 +143,10 @@ depends_on:
|
|||
- build-arm64
|
||||
- build-amd64
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
|
||||
steps:
|
||||
- name: manifest harton.dev/james/dev-container/base
|
||||
image: plugins/manifest
|
||||
|
@ -137,9 +160,6 @@ steps:
|
|||
platforms:
|
||||
- linux/arm64
|
||||
- linux/amd64
|
||||
when:
|
||||
branch:
|
||||
- main
|
||||
|
||||
- name: manifest harton.dev/james/dev-container/elixir
|
||||
image: plugins/manifest
|
||||
|
@ -153,9 +173,6 @@ steps:
|
|||
platforms:
|
||||
- linux/arm64
|
||||
- linux/amd64
|
||||
when:
|
||||
branch:
|
||||
- main
|
||||
|
||||
- name: manifest harton.dev/james/dev-container/rust
|
||||
image: plugins/manifest
|
||||
|
@ -169,7 +186,4 @@ steps:
|
|||
platforms:
|
||||
- linux/arm64
|
||||
- linux/amd64
|
||||
when:
|
||||
branch:
|
||||
- main
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
FROM harton.dev/james/dev-container/base
|
||||
ARG ARCH
|
||||
|
||||
FROM harton.dev/james/dev-container/base:latest-${ARCH}
|
||||
|
||||
ARG USERNAME=vscode
|
||||
ARG USER_UID=1000
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
FROM harton.dev/james/dev-container/base
|
||||
ARG ARCH
|
||||
|
||||
FROM harton.dev/james/dev-container/base:latest-${ARCH}
|
||||
|
||||
RUN asdf asdf plugin add rust
|
||||
RUN asdf asdf install rust latest
|
||||
|
|
Loading…
Reference in a new issue