From e90d8a9f707f3ac6018b10ced96ad9df7f26a325 Mon Sep 17 00:00:00 2001 From: Late Night Defender Date: Sun, 12 Nov 2023 16:59:05 +0700 Subject: [PATCH 1/5] Upgrade CI to use Quadlets --- .gitlab-ci.yml | 13 ++++++------- little-lines-backend.container | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 little-lines-backend.container diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d42dc30..a487215 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,18 +6,17 @@ stages: remove-old-services: stage: prepare script: - - podman stop ll-backend - - podman rm ll-backend + - systemctl --user stop little-lines-backend + - podman rm --force little-lines-backend + - cp little-lines-backend.container ~/.config/containers/systemd + - systemctl --user daemon-reload container-build: stage: build script: - - podman build -t ll-backend . + - podman build -t little-lines-backend . container-deploy: stage: deploy script: - - podman run --name ll-backend -p 5001:5001 -v /home/sasha/Data1/Apps/ll-backend/.env:/opt/ll-backend/.env -d ll-backend - - podman generate systemd ll-backend > ~/.config/systemd/user/ll-backend.service - - systemctl --user daemon-reload - - systemctl --user enable ll-backend + - systemctl --user start little-lines-backend diff --git a/little-lines-backend.container b/little-lines-backend.container new file mode 100644 index 0000000..6bd60c4 --- /dev/null +++ b/little-lines-backend.container @@ -0,0 +1,14 @@ +[Unit] +Description=Little Lines backend container + +[Container] +ContainerName=little-lines-backend +Image=localhost/little-lines-backend +PublishPort=5001:5001 +Volume= /media/sasha/Data1/Apps/ll-backend/.env:/opt/ll-backend/.env + +[Service] +Restart=always + +[Install] +WantedBy=multi-user.target default.target From d5c994983dc833b773dc726db8bcfea814151cc5 Mon Sep 17 00:00:00 2001 From: Late Night Defender Date: Sun, 12 Nov 2023 17:16:03 +0700 Subject: [PATCH 2/5] use alpine container instead of nginx:apline --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f586e5..1af8933 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:alpine +FROM docker.io/library/alpine:latest # Set up environment for building RUN apk add yarn nodejs From 6931a29822d3af30fd6296c7cf719e9468c55c69 Mon Sep 17 00:00:00 2001 From: NekoVari Date: Sun, 12 Nov 2023 22:17:57 +0700 Subject: [PATCH 3/5] update send version --- server.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server.js b/server.js index 9964297..2827ca2 100644 --- a/server.js +++ b/server.js @@ -8,6 +8,11 @@ app.use(express.json()); app.use(cors()); app.use('/api/users', require('./routes/userRoute')); +app.get('/', function(req, res) { + res.json({ + version: DATE-VERSION + }); +}); app.listen(process.env.PORT, () => { console.log(`server's running on port ${process.env.PORT}`); From a50364eaece63e34bf3d56f1590801758608cca4 Mon Sep 17 00:00:00 2001 From: Late Night Defender Date: Sun, 12 Nov 2023 22:36:33 +0700 Subject: [PATCH 4/5] put date and version string in quotes --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 2827ca2..c7c3071 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.use('/api/users', require('./routes/userRoute')); app.get('/', function(req, res) { res.json({ - version: DATE-VERSION + version: "DATE-VERSION" }); }); From 05c8212b75aba570d009943e3703d3e4ee7640b3 Mon Sep 17 00:00:00 2001 From: Late Night Defender Date: Sun, 12 Nov 2023 22:39:40 +0700 Subject: [PATCH 5/5] auto update date and version string --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a487215..90e6fe9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,8 @@ remove-old-services: container-build: stage: build script: + - sed -i "s/DATE/$(date -I)/g" ${CI_PROJECT_DIR}/server.js + - sed -i "s/VERSION/$(git log -1 --oneline | awk '{print $1}')/g" ${CI_PROJECT_DIR}/server.js - podman build -t little-lines-backend . container-deploy: