Skip to content

Commit

Permalink
Merge pull request #1283 from dappnode/revert-1276-pablo/upgrade-dock…
Browse files Browse the repository at this point in the history
…er-node

Revert "Update docker node engine version"
  • Loading branch information
pablomendezroyo authored Dec 1, 2022
2 parents 9d4d494 + f2bcf3a commit b1f45ef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
ARG NODE_VERSION=19.2.0

# Common base so it's cached
# --platform=$BUILDPLATFORM is used build javascript source with host arch
# Otherwise webpack builds on emulated archs can be extremely slow (+1h)
#####################################
FROM --platform=${BUILDPLATFORM:-amd64} node:${NODE_VERSION}-alpine as build-monorepo
FROM --platform=${BUILDPLATFORM:-amd64} node:16.15.0-alpine as build-monorepo

WORKDIR /app

Expand Down Expand Up @@ -37,7 +35,7 @@ RUN yarn build

# Compute git data
#####################################
FROM --platform=${BUILDPLATFORM:-amd64} node:${NODE_VERSION}-alpine as git-data
FROM --platform=${BUILDPLATFORM:-amd64} node:16.15.0-alpine as git-data

WORKDIR /usr/src/app

Expand All @@ -51,15 +49,15 @@ RUN node getGitData /usr/src/app/.git-data.json

# Build binaries
#####################################
FROM node:${NODE_VERSION}-alpine as build-binaries
FROM node:16.15.0-alpine as build-binaries

RUN apk add --no-cache bind-tools docker



# Final layer
#####################################
FROM node:${NODE_VERSION}-alpine
FROM node:16.15.0-alpine

ENV DOCKER_COMPOSE_VERSION v2.5.0

Expand Down
4 changes: 1 addition & 3 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
ARG NODE_VERSION=19.2.0

# Common base so it's cached
# --platform=$BUILDPLATFORM is used build javascript source with host arch
# Otherwise webpack builds on emulated archs can be extremely slow (+1h)
#####################################
FROM --platform=${BUILDPLATFORM:-amd64} node:${NODE_VERSION}-alpine as build-monorepo
FROM --platform=${BUILDPLATFORM:-amd64} node:16.15.0-alpine as build-monorepo

WORKDIR /app

Expand Down

0 comments on commit b1f45ef

Please sign in to comment.