Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(docker): Add node20 build in docker/build.sh #8308

Merged
merged 4 commits into from
Jul 15, 2024

Conversation

chocobn69
Copy link
Contributor

I just added node20 in build.sh, nothing mre

Copy link

changeset-bot bot commented Jul 8, 2024

⚠️ No Changeset found

Latest commit: ea1cbae

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link

netlify bot commented Jul 8, 2024

Deploy Preview for car-park-attendant-cleat-11576 ready!

Name Link
🔨 Latest commit ea1cbae
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/6690e4603660b500088bb25d
😎 Deploy Preview https://deploy-preview-8308--car-park-attendant-cleat-11576.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

docker/build.sh Outdated Show resolved Hide resolved
Remove ref to private docker repo
@chocobn69
Copy link
Contributor Author

Do you want me to change CHANGELOG.md, documentation and increase version number ?

@mmaietta
Copy link
Collaborator

mmaietta commented Jul 9, 2024

Do you want me to change CHANGELOG.md, documentation and increase version number ?

I can take care of that with the normal CI/CD release automation :)

@mmaietta mmaietta changed the title Add node20 build in docker/build.sh chore(docker): Add node20 build in docker/build.sh Jul 9, 2024
docker/build.sh Outdated Show resolved Hide resolved
@mmaietta
Copy link
Collaborator

mmaietta commented Jul 9, 2024

Another quick note, since we're upgrading the node version of the latest image, we should update thepackage.json for test-linux to use electronuserland/builder:20-wine-mono so that we can get this tested via CI as well

docker/build.sh Outdated Show resolved Hide resolved
Use node 10 in package.json
@mmaietta
Copy link
Collaborator

Please apply this patch.dff to your PR or open up write access so that I can add some changes to this PR 🙂

From d0a93b804556619bbc243d72ba2496e44fa2ad16 Mon Sep 17 00:00:00 2001
From: Mike Maietta <[email protected]>
Date: Thu, 11 Jul 2024 13:57:54 -0700
Subject: [PATCH] update image tags

---
 .changeset/two-emus-hang.md | 5 +++++
 docker/build.sh             | 6 +++---
 docker/node/Dockerfile      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/two-emus-hang.md

diff --git a/.changeset/two-emus-hang.md b/.changeset/two-emus-hang.md
new file mode 100644
index 00000000..d93b72e1
--- /dev/null
+++ b/.changeset/two-emus-hang.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": minor
+---
+
+chore: update docker latest image to node 20
diff --git a/docker/build.sh b/docker/build.sh
index b6e9859d..25c2dd10 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -16,9 +16,9 @@ docker build --build-arg IMAGE_VERSION=20-wine-$DATE -t electronuserland/builder
 docker build --build-arg IMAGE_VERSION=20-wine-$DATE -t electronuserland/builder:20-wine-chrome -t "electronuserland/builder:20-wine-chrome-$DATE" -t electronuserland/builder:wine-chrome docker/wine-chrome
 
 # Node 18
-docker build --build-arg IMAGE_VERSION=18-$DATE -t electronuserland/builder:18-wine -t "electronuserland/builder:18-wine-$DATE" -t electronuserland/builder:wine docker/wine
-docker build --build-arg IMAGE_VERSION=18-wine-$DATE -t electronuserland/builder:18-wine-mono -t "electronuserland/builder:18-wine-mono-$DATE" -t electronuserland/builder:wine-mono docker/wine-mono
-docker build --build-arg IMAGE_VERSION=18-wine-$DATE -t electronuserland/builder:18-wine-chrome -t "electronuserland/builder:18-wine-chrome-$DATE" -t electronuserland/builder:wine-chrome docker/wine-chrome
+docker build --build-arg NODE_VERSION=18.18.2 --build-arg IMAGE_VERSION=18-$DATE -t electronuserland/builder:18-wine -t "electronuserland/builder:18-wine-$DATE" docker/wine
+docker build --build-arg IMAGE_VERSION=18-wine-$DATE -t electronuserland/builder:18-wine-mono -t "electronuserland/builder:18-wine-mono-$DATE" docker/wine-mono
+docker build --build-arg IMAGE_VERSION=18-wine-$DATE -t electronuserland/builder:18-wine-chrome -t "electronuserland/builder:18-wine-chrome-$DATE" docker/wine-chrome
 
 # Node 16
 docker build --build-arg NODE_VERSION=16.20.2 --build-arg IMAGE_VERSION=base-$DATE -t electronuserland/builder:16 -t "electronuserland/builder:16-$DATE" docker/node
diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
index 27be3ea4..4318aa07 100644
--- a/docker/node/Dockerfile
+++ b/docker/node/Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_VERSION=base
 FROM electronuserland/builder:$IMAGE_VERSION
 
-ARG NODE_VERSION 18.18.2
+ARG NODE_VERSION 20.15.1
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
-- 
2.37.0


@chocobn69
Copy link
Contributor Author

Please apply this patch.dff to your PR or open up write access so that I can add some changes to this PR 🙂

I invited with write access + I applied patch on docker/build.sh and docker/node/Dockerfile

@mmaietta mmaietta merged commit 16938b2 into electron-userland:master Jul 15, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants