From 95d28e59527016c22c9a429c6db0dffe52c2c1a7 Mon Sep 17 00:00:00 2001 From: VRSasha Date: Sun, 24 Sep 2023 18:36:06 +0700 Subject: [PATCH 1/3] Add Docker and CI stuff --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ Dockerfile | 14 ++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..696490e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,23 @@ +stages: + - prepare + - build + - deploy + +remove-old-services: + stage: prepare + script: + - podman stop ll-backend + - podman rm ll-backend + +container-build: + stage: build + script: + - podman build -t ll-backend . + +container-deploy: + stage: deploy + script: + - podman run --name ll-backend -p 5001:5001 -d ll-backend + - podman generate systemd ll-backend > ~/.config/systemd/user/ll-backend.service + - systemctl --user daemon-reload + - systemctl --user enable ll-backend diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..20429bf --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +FROM nginx:alpine + +# Set up environment for building +RUN apk add yarn nodejs + +# Copy files to build environment +RUN mkdir /opt/ll-backend +RUN cp /home/sasha/Data1/Apps/ll-backend/.env /opt/ll-backend +COPY . /opt/ll-backend + +# Run Vite production build +WORKDIR /opt/ll-backend +RUN yarn +CMD yarn run start From 8a876da4357fb739d1e3d4934b8279c835946019 Mon Sep 17 00:00:00 2001 From: VRSasha Date: Sun, 24 Sep 2023 18:39:48 +0700 Subject: [PATCH 2/3] Fix Dockerfile env --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20429bf..c199e00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk add yarn nodejs # Copy files to build environment RUN mkdir /opt/ll-backend -RUN cp /home/sasha/Data1/Apps/ll-backend/.env /opt/ll-backend +COPY /home/sasha/Data1/Apps/ll-backend/.env /opt/ll-backend COPY . /opt/ll-backend # Run Vite production build From 0fb3ea8b33e597ad31dba827e630508e93fe0ec5 Mon Sep 17 00:00:00 2001 From: VRSasha Date: Sun, 24 Sep 2023 18:59:02 +0700 Subject: [PATCH 3/3] Attempt to fix env path again --- .gitlab-ci.yml | 2 +- Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 696490e..d42dc30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ container-build: container-deploy: stage: deploy script: - - podman run --name ll-backend -p 5001:5001 -d ll-backend + - 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 diff --git a/Dockerfile b/Dockerfile index c199e00..2f586e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,6 @@ RUN apk add yarn nodejs # Copy files to build environment RUN mkdir /opt/ll-backend -COPY /home/sasha/Data1/Apps/ll-backend/.env /opt/ll-backend COPY . /opt/ll-backend # Run Vite production build