upgrade to ubuntu 24.04

fibos123 · Jan 21, 2024 · bb8fe9e · bb8fe9e
1 parent 386fd75
commit bb8fe9e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 162 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,4 @@
+{
+	"name": "ubuntu 24.04",
+	"image": "ubuntu:24.04"
+}
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,12 @@
-FROM ubuntu:latest
+FROM ubuntu:24.04
 
-WORKDIR /fibos
+WORKDIR /app
 
 RUN apt-get update -y \
-  && apt-get install -y curl sudo wget libusb-1.0-0 libcurl3-gnutls libncurses5 \
+  && apt-get install -y curl sudo wget libusb-1.0-0 libcurl3-gnutls \
+  && wget "http://security.ubuntu.com/ubuntu/pool/main/n/ncurses/libtinfo5_6.1-1ubuntu1_amd64.deb" \
+  && dpkg -i libtinfo5_6.1-1ubuntu1_amd64.deb \
+  && rm libtinfo5_6.1-1ubuntu1_amd64.deb \
   && wget "http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb" \
   && dpkg -i libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb \
   && rm libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb \
@@ -20,4 +23,4 @@ ADD start.sh .
 
 EXPOSE 8080
 
-ENTRYPOINT ["bash", "/fibos/start.sh"]
+ENTRYPOINT ["bash", "/app/start.sh"]
diff --git a/build-docker-and-run.sh b/build-docker-and-run.sh
diff --git a/install-from-helm.sh b/install-from-helm.sh
diff --git a/k8s.yaml b/k8s.yaml
diff --git a/start.sh b/start.sh
@@ -3,7 +3,7 @@ set -e
 
 SNAPSHOT_FOLDER=./data/snapshots
 
-if [ "$SNAPSHOT_ENABLE" = "true" ]; then
+if [ "$SNAPSHOT_ENABLE" != "false" ]; then
 
   export SNAPSHOT_FILE=$SNAPSHOT_FOLDER/snapshot.bin
   rm -rf ./data/*
@@ -22,4 +22,4 @@ if [ "$SNAPSHOT_ENABLE" = "true" ]; then
   wget $SNAPSHOT_URL -O $SNAPSHOT_FILE
 fi
 
-fibos /fibos/start.js
+fibos ./start.js