larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Website: Upgrade Ubuntu and Node install process (#4230)

Browse Source 
Fixes build failures and depreciations

---

#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🐛 Bugfix
- [x] 🗺️ Documentation
This commit is contained in:
Niraj Tolia 2023-09-12 16:23:10 -07:00 committed by GitHub
parent 6a15f699aa
commit e36545d370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/Dockerfile
View File

@ -1,11 +1,14 @@
FROM ubuntu:22.10 FROM ubuntu:23.04
LABEL MAINTAINER="Niraj Tolia" LABEL MAINTAINER="Niraj Tolia"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
# NOTE for lines 13,15: update in CI when updating # NOTE for lines 17,19: update in CI when updating
RUN apt-get -y update && apt-get -y install gpg emacs curl zip git make \ RUN apt-get -y update && apt-get -y install gpg curl git make ca-certificates gnupg \
&& curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \ && mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
&& apt-get -y install nodejs \ && apt-get -y install nodejs \
&& apt-get autoclean \ && apt-get autoclean \
&& node --version \ && node --version \

2
website/Makefile
View File

@ -1,6 +1,6 @@
.PHONY: buildimage build dev shell check genclidocs _validatemdgen publish sync .PHONY: buildimage build dev shell check genclidocs _validatemdgen publish sync
GO_VERSION := 1.20 GO_VERSION := 1.21
CORSO_BUILD_DIR := /tmp/.corsobuild CORSO_BUILD_DIR := /tmp/.corsobuild
CORSO_BUILD_CACHE := ${CORSO_BUILD_DIR}/cache CORSO_BUILD_CACHE := ${CORSO_BUILD_DIR}/cache
CORSO_BUILD_MOD := ${CORSO_BUILD_DIR}/mod CORSO_BUILD_MOD := ${CORSO_BUILD_DIR}/mod