From 5323504a872102e725b9d90bbb31015d74ab12d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Starc?= Date: Mon, 23 Oct 2023 22:54:08 +0200 Subject: [PATCH 1/2] restructure stuff, add logging, use node 20 --- Dockerfile | 10 ---------- docker-compose.yaml | 8 ++++---- dockerfile | 11 +++++++++++ src/index.js => index.js | 1 + src/package.json => package.json | 0 .../NavodilaZaProgramerjeUPNQR.pdf | Bin {src/public => public}/invalid-content.png | Bin {src/public => public}/style.css | 0 {src/views => views}/form.ejs | 0 {src/views => views}/index.ejs | 4 ---- src/yarn.lock => yarn.lock | 0 11 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 Dockerfile create mode 100644 dockerfile rename src/index.js => index.js (91%) rename src/package.json => package.json (100%) rename {src/public => public}/NavodilaZaProgramerjeUPNQR.pdf (100%) rename {src/public => public}/invalid-content.png (100%) rename {src/public => public}/style.css (100%) rename {src/views => views}/form.ejs (100%) rename {src/views => views}/index.ejs (97%) rename src/yarn.lock => yarn.lock (100%) diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 406655d..0000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:14 - -WORKDIR /var/src - -COPY src/package.json src/yarn.lock /var/src/ -RUN yarn install - -COPY src /var/src - -CMD [ "yarn", "run", "start" ] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 7dcbe75..b119d8f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,16 +5,16 @@ services: image: node:14 build: context: ./ - dockerfile: Dockerfile + dockerfile: dockerfile command: ["yarn", "run", "dev"] environment: ENV: development NODE_ENV: development volumes: - - ./src:/var/src - - /var/src/node_modules + - ./:/app + - /app/node_modules ports: - - 8080:80 + - 80:80 healthcheck: test: ["CMD", "curl", "-sSG", "http://localhost/healthcheck"] interval: 30s diff --git a/dockerfile b/dockerfile new file mode 100644 index 0000000..0c95991 --- /dev/null +++ b/dockerfile @@ -0,0 +1,11 @@ +FROM node:20-alpine + +WORKDIR /app + +COPY package.json yarn.lock /app/ +RUN yarn install + +COPY public/ views/ /app/ +COPY index.js /app/ + +CMD [ "yarn", "run", "start" ] \ No newline at end of file diff --git a/src/index.js b/index.js similarity index 91% rename from src/index.js rename to index.js index 34ec6a8..daa05ce 100644 --- a/src/index.js +++ b/index.js @@ -19,6 +19,7 @@ app.get('/healthcheck', (req, res) => res.send({ ok: true, pod: process.env.POD_ app.get('/form', (req, res) => res.render('form', { q: req.query })) app.get('/api/qrcode', async (req, res) => { + console.log(`/api/qrcode "${req.query['client_name']}" "${req.query['client_address']}" "${req.query['client_city']}" "${req.query['amount']}" "${req.query['payment_purpose']}" "${req.query['iban']}" "${req.query['reference']}" "${req.query['issuer_name']}" "${req.query['issuer_address']}" "${req.query['issuer_city']}"`) const errors = [] function check (name, rgxp) { diff --git a/src/package.json b/package.json similarity index 100% rename from src/package.json rename to package.json diff --git a/src/public/NavodilaZaProgramerjeUPNQR.pdf b/public/NavodilaZaProgramerjeUPNQR.pdf similarity index 100% rename from src/public/NavodilaZaProgramerjeUPNQR.pdf rename to public/NavodilaZaProgramerjeUPNQR.pdf diff --git a/src/public/invalid-content.png b/public/invalid-content.png similarity index 100% rename from src/public/invalid-content.png rename to public/invalid-content.png diff --git a/src/public/style.css b/public/style.css similarity index 100% rename from src/public/style.css rename to public/style.css diff --git a/src/views/form.ejs b/views/form.ejs similarity index 100% rename from src/views/form.ejs rename to views/form.ejs diff --git a/src/views/index.ejs b/views/index.ejs similarity index 97% rename from src/views/index.ejs rename to views/index.ejs index 5ea8bd9..d0da240 100644 --- a/src/views/index.ejs +++ b/views/index.ejs @@ -49,10 +49,6 @@ section div { The application does not keep any long-term logs.

-
-

Terms of usage

-

Because The Bank Association of Slovenia prohibits the printing and use of UPN-QR codes on bills by any unauthorized party, you must be authorized in order to use this application to generate a QR code and print it.

-

🔗 Form maker

Fill in the fields with reciever's bank information and leave empty the ones that user has to fill out. diff --git a/src/yarn.lock b/yarn.lock similarity index 100% rename from src/yarn.lock rename to yarn.lock From 548ddc98e71345f250cc44970acdbd1af17c49e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Starc?= Date: Mon, 23 Oct 2023 22:55:33 +0200 Subject: [PATCH 2/2] Fix build-oci --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e675a6a..1a18189 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ build-oci: stage: build - image: registry.gitplac.si/cts/build-oci:1.0.3 + image: registry.gitplac.si/cts/build-oci:1.2.2 script: [ "/build.sh" ] variables: - CTS_BUILD_DOCKERFILE: Dockerfile + CTS_BUILD_DOCKERFILE: dockerfile rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH variables: