From ea7f6d8ff7c5d9bb7b334bc626d844db1b89a706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez?= Date: Wed, 11 Dec 2024 14:44:22 +0100 Subject: [PATCH 1/2] update devcontainer --- .devcontainer/Dockerfile | 18 +++++++++++++----- .devcontainer/devcontainer.json | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0fda59b..4caddec 100755 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,13 +1,13 @@ # Use an official node image as a parent image -FROM node:20 +FROM node:23 # Set environment variables for versions -ARG HUGO_VERSION=0.126.1 -ARG GO_VERSION=1.22.3 +ARG HUGO_VERSION=0.139.4 +ARG GO_VERSION=1.23.4 # Install dependencies RUN apt-get update && \ - apt-get install -y ca-certificates openssl git curl && \ + apt-get install -y ca-certificates openssl git curl wget build-essential && \ rm -rf /var/lib/apt/lists/* # Determine architecture @@ -15,7 +15,7 @@ RUN ARCH=$(uname -m) && \ if [ "$ARCH" = "aarch64" ]; then ARCH=arm64; else ARCH=amd64; fi && \ echo "Architecture: $ARCH" -# Download and install Hugo +# Download and install Hugo Extended RUN ARCH=$(uname -m) && \ if [ "$ARCH" = "aarch64" ]; then ARCH=arm64; else ARCH=amd64; fi && \ wget -O hugo_extended_${HUGO_VERSION}.tar.gz https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${ARCH}.tar.gz && \ @@ -34,3 +34,11 @@ RUN ARCH=$(uname -m) && \ # Export Go path ENV PATH=$PATH:/usr/local/go/bin + +# Verify versions +RUN git --version && \ + hugo version && \ + go version + +# Default shell +CMD ["/bin/bash"] diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 43add03..59c7d1d 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,8 +3,8 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GO_VERSION": "1.22.3", - "HUGO_VERSION": "0.126.1" + "GO_VERSION": "1.23.4", + "HUGO_VERSION": "0.139.4" } }, "customizations": { @@ -18,6 +18,6 @@ } }, "remoteUser": "node", - "postCreateCommand": "npm install && npm run dev:example", + "postCreateCommand": "npm run project-setup && npm install && npm run dev:example", "forwardPorts": [1313] } \ No newline at end of file From 65048b1a02e2b68b595695092f569e1437af0f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez?= Date: Wed, 11 Dec 2024 14:47:27 +0100 Subject: [PATCH 2/2] update devcontainer --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 59c7d1d..5e7f904 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,4 +20,4 @@ "remoteUser": "node", "postCreateCommand": "npm run project-setup && npm install && npm run dev:example", "forwardPorts": [1313] -} \ No newline at end of file +}