Skip to content

Commit

Permalink
Merge branch 'main' into tm-fix-npm-workspace-dir-with-period
Browse files Browse the repository at this point in the history
  • Loading branch information
trentm committed Jul 30, 2024
2 parents 471a0db + 99ba29d commit 2930af2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/containerbase/devcontainer:11.2.0
FROM ghcr.io/containerbase/devcontainer:11.4.0
6 changes: 3 additions & 3 deletions tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ ARG BASE_IMAGE_TYPE=slim
# --------------------------------------
# slim image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:7.4.0@sha256:bae89b03e552636ea0bbf1835616414d93ab6d9e01dc21ff15ad21d72963adfd AS slim-base
FROM ghcr.io/renovatebot/base-image:7.5.0@sha256:ef3eb7602f18cc622d05305e0a6d230a8ed5a9b4bd5d449dcb0d1d133ab9decf AS slim-base

# --------------------------------------
# full image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:7.4.0-full@sha256:f297a48e1d556906037d62964821d51843353593c3298c2aff2830fcdb1af780 AS full-base
FROM ghcr.io/renovatebot/base-image:7.5.0-full@sha256:b0903c74fa26606b4326761342a0a53b85e8186a9cfea113d9813025382795cf AS full-base

# --------------------------------------
# build image
# --------------------------------------
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:7.4.0@sha256:bae89b03e552636ea0bbf1835616414d93ab6d9e01dc21ff15ad21d72963adfd AS build
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:7.5.0@sha256:ef3eb7602f18cc622d05305e0a6d230a8ed5a9b4bd5d449dcb0d1d133ab9decf AS build

# We want a specific node version here
# renovate: datasource=node-version
Expand Down

0 comments on commit 2930af2

Please sign in to comment.