[INFRA-1474] Some code refactoring and cleanup (#7)

Leen15 · web-flow · commit c47071e4c483 · 2023-09-18T15:55:01.000+02:00
* [INFRA-1474] Some code refactoring and cleanup
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
-iac-repo
+iac-repo
+.env
diff --git a/.drone.yml b/.drone.yml
@@ -136,6 +136,6 @@ get:
   name: dockerconfigjson
 ---
 kind: signature
-hmac: a99348bb2060b9cbe2fcaaaeee8df0812a20ec9c4bb09f81b1f96119433c14e1
+hmac: 1124d1f9c29438b718e1bb673df6c54e70ee258556b3206083b79faa4ea8ff84
 
 ...
diff --git a/.env.dist b/.env.dist
@@ -5,4 +5,5 @@ DEPLOY_ENVIRONMENTS=
 DEPLOY_CONF_FILE=
 DEPLOY_AGE_KEYS=
 DEPLOY_DRY_RUN=
-DEPLOY_ASK_CONFIRM=
+DEPLOY_ASK_CONFIRM=
+DEBUG_SKIP_CLONE_REPO_STEP=
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ draw-with-git/
 conf.yaml
 age_keys.txt
 .DS_Store
+.byebug_history
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM rancher/cli2:v2.7.0 as ranchercli
 
-FROM ruby:3.2.0-slim AS ruby
+FROM ruby:3.2.2-slim-bookworm AS ruby
 
 
 RUN apt-get update -qq && \
@@ -10,9 +10,18 @@ RUN apt-get update -qq && \
                        git curl unzip \
                        groff \
                        libssl-dev \
-                       libcurl4-openssl-dev && \
-    curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
-    apt-get install -y nodejs
+                       libcurl4-openssl-dev
+
+# install nodejs
+RUN apt-get install -y ca-certificates curl gnupg && \
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
+    | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+ENV NODE_MAJOR=20
+RUN echo "deb  [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" \
+    | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 
 RUN node -v
 RUN npm -v
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    colorize (0.8.1)
+    colorize (1.1.0)
     deep_merge (1.2.2)
     dotenv (2.8.1)
-    git (1.13.2)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rchardet (1.8.0)
     tty-color (0.6.0)
     tty-command (0.10.1)
@@ -21,6 +21,7 @@ PLATFORMS
   arm64-darwin-22
   universal-darwin-20
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   colorize
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2021 UALA
+Copyright (c) 2005-2023 UALA
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/app/controllers/deployer_controller.rb b/app/controllers/deployer_controller.rb
diff --git a/app/utilities/deployer_utilities.rb b/app/utilities/deployer_utilities.rb
diff --git a/deployer.rb b/deployer.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2005-2021 UALA`
	`1`	`+Copyright (c) 2005-2023 UALA`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining`
`4`	`4`	`a copy of this software and associated documentation files (the`