Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .devcontainer/cpp-test/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "gabrielfrasantos/embedded-devcontainer:${localEnv:IMAGE_VERSION}",
"image": "gabrielfrasantos/embedded-devcontainer-cpp:${localEnv:IMAGE_VERSION}",
"workspaceFolder": "/workspaces/embedded-devcontainer/test/cpp/workspace",
"containerEnv": {
"NODE_EXTRA_CA_CERTS": "/etc/ssl/certs/ca-certificates.crt"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Environment (please complete the following information):**
- Container: [e.g. gabrielfrasantos/embedded-devcontainer:1.0.0]
- Container: [e.g. gabrielfrasantos/embedded-devcontainer-cpp:1.0.0]
- OS: [e.g. Windows, Linux, OSX]
- Architecture: [e.g. x86_64, Apple M2]
- Docker Version: [e.g. Docker Desktop 4.25.2]
Expand Down
2 changes: 1 addition & 1 deletion .github/RELEASE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
| Container | Full identifier |
|----------------------------|---------------------------------------------------------------------------------------------------------------------------|
| embedded-devcontainer-base | gabrielfrasantos/embedded-devcontainer-base:{{ embedded-devcontainer-base-version }}@{{ embedded-devcontainer-base-sha }} |
| embedded-devcontainer-cpp | gabrielfrasantos/embedded-devcontainer:{{ embedded-devcontainer-cpp-version }}@{{ embedded-devcontainer-cpp-sha }} |
| embedded-devcontainer-cpp | gabrielfrasantos/embedded-devcontainer-cpp:{{ embedded-devcontainer-cpp-version }}@{{ embedded-devcontainer-cpp-sha }} |
| embedded-devcontainer-rust | gabrielfrasantos/embedded-devcontainer-rust:{{ embedded-devcontainer-rust-version }}@{{ embedded-devcontainer-rust-sha }} |

19 changes: 6 additions & 13 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,9 @@ upstream sync must re-apply the deltas listed below.
| Flavor | Upstream image | This fork |
| ------ | ----------------------------------------------------------- | --------------------------------------------------------------- |
| base | `ghcr.io/philips-software/amp-devcontainer-base` | `docker.io/gabrielfrasantos/embedded-devcontainer-base` |
| cpp | `ghcr.io/philips-software/amp-devcontainer-cpp` | `docker.io/gabrielfrasantos/embedded-devcontainer` (no suffix) |
| cpp | `ghcr.io/philips-software/amp-devcontainer-cpp` | `docker.io/gabrielfrasantos/embedded-devcontainer-cpp` |
| rust | `ghcr.io/philips-software/amp-devcontainer-rust` | `docker.io/gabrielfrasantos/embedded-devcontainer-rust` |
Comment thread
gabrielfrasantos marked this conversation as resolved.

Comment thread
gabrielfrasantos marked this conversation as resolved.
Note: the `cpp` flavor is intentionally the "default" image (no `-cpp` suffix)
to preserve the historical Docker Hub repo name. The base and rust images keep
their `-base` / `-rust` suffix.

### Workflow deltas (vs upstream)

- `build-push-test.yml` overrides `registry: docker.io` and pins each flavor's
Expand All @@ -52,11 +48,9 @@ their `-base` / `-rust` suffix.
reusable `wc-build-push-test.yml`.
- `continuous-integration.yml` and `release-build.yml` forward the same two
Docker Hub secrets.
- `vulnerability-scan.yml` scans the Docker Hub images (with the cpp
no-suffix special case) and uses the correct per-flavor Dockerfile path
- `vulnerability-scan.yml` scans the Docker Hub images and uses the correct per-flavor Dockerfile path
`.devcontainer/${{ matrix.flavor }}/Dockerfile`.
- `update-dependencies.yml` runs in the published Docker Hub image at the
`:latest` tag (same no-suffix cpp special case).
- `update-dependencies.yml` runs in the published Docker Hub image at the `:latest` tag.
- `image-cleanup.yml` / `pr-image-cleanup.yml` still target ghcr.io via
`dataaxiom/ghcr-cleanup-action`. They are effectively no-ops in this fork
(we publish to Docker Hub). Leave them or remove them — do not point them
Expand All @@ -72,12 +66,11 @@ Run a global rebrand on every upstream sync. The mapping is:

- `philips-software/amp-devcontainer` → `embedded-pro/embedded-devcontainer`
- `amp-devcontainer-base` / `-rust` → `embedded-devcontainer-base` / `-rust`
- `amp-devcontainer-cpp` → `embedded-devcontainer-cpp` (text) **but**
`gabrielfrasantos/embedded-devcontainer` (image, no suffix)
- `amp-devcontainer-cpp` → `embedded-devcontainer-cpp` (text and image)
- `amp-devcontainer` (bare) → `embedded-devcontainer`
- `/workspaces/amp-devcontainer` → `/workspaces/embedded-devcontainer`
- `https://github.com/orgs/philips-software/packages/container/package/amp-devcontainer-X`
→ `https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer[-X]`
→ `https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer-X`

**Preserve:**

Expand All @@ -93,7 +86,7 @@ For CI to actually publish, the following must be set in this fork:

- Repository secrets `DOCKER_REGISTRY_USERNAME` and `DOCKER_REGISTRY_PASSWORD`
(Docker Hub PAT for the `gabrielfrasantos` account).
- The Docker Hub repos `gabrielfrasantos/embedded-devcontainer`,
- The Docker Hub repos `gabrielfrasantos/embedded-devcontainer-cpp`,
`gabrielfrasantos/embedded-devcontainer-base`, and
`gabrielfrasantos/embedded-devcontainer-rust` must exist.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-push-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
devcontainer-metadata-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata.json
dockerfile: .devcontainer/${{ matrix.flavor }}/Dockerfile
enable-edge-tag: ${{ github.event_name == 'merge_group' }}
image-name: ${{ matrix.flavor == 'cpp' && 'gabrielfrasantos/embedded-devcontainer' || format('gabrielfrasantos/embedded-devcontainer-{0}', matrix.flavor) }}
image-name: gabrielfrasantos/embedded-devcontainer-${{ matrix.flavor }}
registry: docker.io
Comment thread
gabrielfrasantos marked this conversation as resolved.
integration-test-file: test/${{ matrix.flavor }}/integration-tests.bats
integration-test-podman: true
2 changes: 1 addition & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
flavor: ["base", "cpp", "rust"]
# Using our own container is required since we need all package sources
# set-up correctly.
container: ${{ matrix.flavor == 'cpp' && 'gabrielfrasantos/embedded-devcontainer' || format('gabrielfrasantos/embedded-devcontainer-{0}', matrix.flavor) }}:latest
container: gabrielfrasantos/embedded-devcontainer-${{ matrix.flavor }}:latest
permissions:
contents: write # is needed by peter-evans/create-pull-request to create branches and push commits
pull-requests: write # is needed by peter-evans/create-pull-request to create a PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vulnerability-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: crazy-max/ghaction-container-scan@a0a3900b79d158c85ccf034e5368fae620a9233a # v4.0.0
id: scan
with:
image: ${{ matrix.flavor == 'cpp' && 'gabrielfrasantos/embedded-devcontainer' || format('gabrielfrasantos/embedded-devcontainer-{0}', matrix.flavor) }}:latest
image: gabrielfrasantos/embedded-devcontainer-${{ matrix.flavor }}:latest
dockerfile: .devcontainer/${{ matrix.flavor }}/Dockerfile
- uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
if: steps.scan.outputs.sarif != ''
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ This repository is under active development; see [pulse](https://github.com/embe
The following devcontainers are published towards the [GitHub Container Registry](https://ghcr.io/):

- [embedded-devcontainer-base](https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer-base); shared base image used by the other flavors
- [embedded-devcontainer-cpp](https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer); the C++ container
- [embedded-devcontainer-cpp](https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer-cpp); the C++ container
- [embedded-devcontainer-rust](https://hub.docker.com/r/gabrielfrasantos/embedded-devcontainer-rust); the Rust container
Comment thread
gabrielfrasantos marked this conversation as resolved.

All containers include a full [Visual Studio Code](https://code.visualstudio.com/) configuration that is compatible with [GitHub Codespaces](https://github.com/features/codespaces).
Expand Down
2 changes: 1 addition & 1 deletion templates/cpp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM gabrielfrasantos/embedded-devcontainer:${templateOption:imageVersion}
FROM gabrielfrasantos/embedded-devcontainer-cpp:${templateOption:imageVersion}

HEALTHCHECK NONE
Loading