diff --git a/.drone.yml b/.drone.yml index 8ac1542..75675c0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,110 +3,110 @@ type: docker name: default steps: -- name: retrieve build cache - image: meltwater/drone-cache - pull: true - environment: - AWS_ACCESS_KEY_ID: - from_secret: ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY: - from_secret: SECRET_ACCESS_KEY - AWS_PLUGIN_PATH_STYLE: true - settings: - restore: true - endpoint: - from_secret: S3_ENDPOINT - bucket: - from_secret: CACHE_BUCKET - region: us-east-1 - path-style: true - mount: .docker-build-cache + - name: retrieve build cache + image: meltwater/drone-cache + pull: true + environment: + AWS_ACCESS_KEY_ID: + from_secret: ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: SECRET_ACCESS_KEY + AWS_PLUGIN_PATH_STYLE: true + settings: + restore: true + endpoint: + from_secret: S3_ENDPOINT + bucket: + from_secret: CACHE_BUCKET + region: us-east-1 + path-style: true + mount: .docker-build-cache -- name: dev-container/base - image: thegeeklab/drone-docker-buildx:24 - privileged: true - depends_on: - - retrieve build cache - settings: - username: james - password: - from_secret: REGISTRY_TOKEN - registry: code.harton.nz - repo: code.harton.nz/james/dev-container/base - cache_from: 'type=local\\,src=.docker-build-cache' - cache_to: 'type=local,dest=.docker-build-cache' - provenance: false - context: ./base - dockerfile: ./base/Dockerfile - tags: - - latest - platforms: - - linux/arm64 - - linux/amd64 + - name: dev-container/base + image: thegeeklab/drone-docker-buildx:24 + privileged: true + depends_on: + - retrieve build cache + settings: + username: james + password: + from_secret: REGISTRY_TOKEN + registry: harton.dev + repo: harton.dev/james/dev-container/base + cache_from: 'type=local\\,src=.docker-build-cache' + cache_to: "type=local,dest=.docker-build-cache" + provenance: false + context: ./base + dockerfile: ./base/Dockerfile + tags: + - latest + platforms: + - linux/arm64 + - linux/amd64 -- name: dev-container/elixir - image: thegeeklab/drone-docker-buildx:24 - privileged: true - depends_on: - - dev-container/base - settings: - username: james - password: - from_secret: REGISTRY_TOKEN - registry: code.harton.nz - repo: code.harton.nz/james/dev-container/elixir - cache_from: 'type=local\\,src=.docker-build-cache' - cache_to: 'type=local,dest=.docker-build-cache' - provenance: false - context: ./elixir - dockerfile: ./elixir/Dockerfile - tags: - - latest - platforms: - - linux/arm64 - - linux/amd64 + - name: dev-container/elixir + image: thegeeklab/drone-docker-buildx:24 + privileged: true + depends_on: + - dev-container/base + settings: + username: james + password: + from_secret: REGISTRY_TOKEN + registry: harton.dev + repo: harton.dev/james/dev-container/elixir + cache_from: 'type=local\\,src=.docker-build-cache' + cache_to: "type=local,dest=.docker-build-cache" + provenance: false + context: ./elixir + dockerfile: ./elixir/Dockerfile + tags: + - latest + platforms: + - linux/arm64 + - linux/amd64 -- name: dev-container/rust - image: thegeeklab/drone-docker-buildx:24 - privileged: true - depends_on: - - dev-container/base - settings: - username: james - password: - from_secret: REGISTRY_TOKEN - registry: code.harton.nz - repo: code.harton.nz/james/dev-container/rust - cache_from: 'type=local\\,src=.docker-build-cache' - cache_to: 'type=local,dest=.docker-build-cache' - provenance: false - context: ./rust - dockerfile: ./rust/Dockerfile - tags: - - latest - platforms: - - linux/arm64 - - linux/amd64 + - name: dev-container/rust + image: thegeeklab/drone-docker-buildx:24 + privileged: true + depends_on: + - dev-container/base + settings: + username: james + password: + from_secret: REGISTRY_TOKEN + registry: harton.dev + repo: harton.dev/james/dev-container/rust + cache_from: 'type=local\\,src=.docker-build-cache' + cache_to: "type=local,dest=.docker-build-cache" + provenance: false + context: ./rust + dockerfile: ./rust/Dockerfile + tags: + - latest + platforms: + - linux/arm64 + - linux/amd64 -- name: store build cache - image: meltwater/drone-cache - pull: true - environment: - AWS_ACCESS_KEY_ID: - from_secret: ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY: - from_secret: SECRET_ACCESS_KEY - AWS_PLUGIN_PATH_STYLE: true - depends_on: - - dev-container/base - - dev-container/elixir - - dev-container/rust - settings: - rebuild: true - endpoint: - from_secret: S3_ENDPOINT - bucket: - from_secret: CACHE_BUCKET - region: us-east-1 - path-style: true - mount: .docker-build-cache + - name: store build cache + image: meltwater/drone-cache + pull: true + environment: + AWS_ACCESS_KEY_ID: + from_secret: ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: SECRET_ACCESS_KEY + AWS_PLUGIN_PATH_STYLE: true + depends_on: + - dev-container/base + - dev-container/elixir + - dev-container/rust + settings: + rebuild: true + endpoint: + from_secret: S3_ENDPOINT + bucket: + from_secret: CACHE_BUCKET + region: us-east-1 + path-style: true + mount: .docker-build-cache diff --git a/README.md b/README.md index e00c56e..5cb5ec2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dev Container. -[![Build Status](https://drone.harton.nz/api/badges/james/dev-container/status.svg)](https://drone.harton.nz/james/dev-container) +[![Build Status](https://drone.harton.dev/api/badges/james/dev-container/status.svg)](https://drone.harton.dev/james/dev-container) This is my personal devcontainer setup which includes [ASDF](https://asdf-vm.com/) and [starship](https://starship.rs/). @@ -8,9 +8,9 @@ It should work as a good starting point for your devcontainer configuration. ## Variants. -* `code.harton.nz/james/dev-container/base` - the container with ASDF and starship installed. -* `code.harton.nz/james/dev-container/elixir` - built on top of the `base` container with the latest versions of Erlang and Elixir pre-installed to reduce build-time. -* `code.harton.nz/james/dev-container/rust` - built on top of the `base` container with the latest version of Rust and it's tooling installed. +- `harton.dev/james/dev-container/base` - the container with ASDF and starship installed. +- `harton.dev/james/dev-container/elixir` - built on top of the `base` container with the latest versions of Erlang and Elixir pre-installed to reduce build-time. +- `harton.dev/james/dev-container/rust` - built on top of the `base` container with the latest version of Rust and it's tooling installed. ## Usage @@ -19,4 +19,3 @@ There are example `.devcontainer` directories in the `examples` directory. ## License Public domain. - diff --git a/base/Dockerfile b/base/Dockerfile index 71456ef..ac04261 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -54,8 +54,8 @@ RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v${ASDF_VERSI # Install dotfiles. RUN mkdir -p $HOME/.config -RUN curl -sS https://code.harton.nz/james/.config/raw/branch/main/starship-devcontainer.toml > $HOME/.config/starship.toml -RUN curl -sS https://code.harton.nz/james/.config/raw/branch/main/zshrc > $HOME/.zshrc +RUN curl -sS https://harton.dev/james/.config/raw/branch/main/starship-devcontainer.toml > $HOME/.config/starship.toml +RUN curl -sS https://harton.dev/james/.config/raw/branch/main/zshrc > $HOME/.zshrc WORKDIR /workspace/ diff --git a/elixir/Dockerfile b/elixir/Dockerfile index 0efb6b7..a2a89d7 100644 --- a/elixir/Dockerfile +++ b/elixir/Dockerfile @@ -1,4 +1,4 @@ -FROM code.harton.nz/james/dev-container/base +FROM harton.dev/james/dev-container/base ARG USERNAME=vscode ARG USER_UID=1000 diff --git a/examples/elixir-postgres/Dockerfile b/examples/elixir-postgres/Dockerfile index 7edf920..ae1cc4e 100644 --- a/examples/elixir-postgres/Dockerfile +++ b/examples/elixir-postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM code.harton.nz/james/dev-container/elixir:latest +FROM harton.dev/james/dev-container/elixir:latest ARG USERNAME=vscode USER ${USERNAME} diff --git a/examples/elixir/Dockerfile b/examples/elixir/Dockerfile index 7edf920..ae1cc4e 100644 --- a/examples/elixir/Dockerfile +++ b/examples/elixir/Dockerfile @@ -1,4 +1,4 @@ -FROM code.harton.nz/james/dev-container/elixir:latest +FROM harton.dev/james/dev-container/elixir:latest ARG USERNAME=vscode USER ${USERNAME} diff --git a/examples/rust/Dockerfile b/examples/rust/Dockerfile index 5c09307..aea89db 100644 --- a/examples/rust/Dockerfile +++ b/examples/rust/Dockerfile @@ -1,4 +1,4 @@ -FROM code.harton.nz/james/dev-container/rust:latest +FROM harton.dev/james/dev-container/rust:latest ARG USERNAME=vscode USER ${USERNAME} diff --git a/rust/Dockerfile b/rust/Dockerfile index f8eef58..3737e06 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -1,4 +1,4 @@ -FROM code.harton.nz/james/dev-container/base +FROM harton.dev/james/dev-container/base RUN asdf asdf plugin add rust RUN asdf asdf install rust latest