From fe1d59a3bb2d33e73c542b33fa1877382108bd6b Mon Sep 17 00:00:00 2001
From: Florian THIERRY <florian.thierry@protonmail.com>
Date: Sun, 22 Sep 2024 12:37:01 +0200
Subject: [PATCH] test

---
 Dockerfile-frontend |  7 ++--
 Jenkinsfile-test    | 78 ---------------------------------------------
 2 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 Jenkinsfile-test

diff --git a/Dockerfile-frontend b/Dockerfile-frontend
index 6bd2312..7b6411a 100644
--- a/Dockerfile-frontend
+++ b/Dockerfile-frontend
@@ -2,12 +2,11 @@ FROM node:22-alpine AS builder
 WORKDIR /app
 COPY frontend /app
 RUN npm install
-# RUN npm run build-prod-en
+RUN npm run build-prod-en
 RUN npm run build-prod-fr
 
 FROM nginx:1.27-alpine AS final
 WORKDIR /app
-RUN ls -l /app/dist/codiki-ng/fr/browser
-COPY --from=builder /app/dist/codiki-ng/en/browser /usr/share/nginx/html/en/
-COPY --from=builder /app/dist/codiki-ng/fr/browser/fr /usr/share/nginx/html/fr/
+COPY --from=builder /app/dist/codiki/en/browser /usr/share/nginx/html/en/
+COPY --from=builder /app/dist/codiki/fr/browser/fr /usr/share/nginx/html/fr/
 COPY frontend/conf/nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/Jenkinsfile-test b/Jenkinsfile-test
deleted file mode 100644
index 9d9baf5..0000000
--- a/Jenkinsfile-test
+++ /dev/null
@@ -1,78 +0,0 @@
-pipeline {
-    agent any
-
-    stages {
-        stage('Configuration') {
-            steps {
-                dir('codiki-properties') {
-                    git url:'https://gitea.takiguchi.ovh/Codiki/codiki-properties.git', branch: 'hexagonal-reforged', credentialsId: 'Jenkins-gitea'
-                }
-                script {
-                    sh 'sed -i "s/<POSTGRES_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_user)/g" ./codiki-properties/application-prod.yml'
-                    sh 'sed -i "s/<POSTGRES_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_admin)/g" ./docker-compose.yml'
-                }
-            }
-        }
-        stage('Build') {
-            steps {
-                script {
-                    sh """
-                        sudo /usr/bin/docker build -t codiki-frontend -f ./Dockerfile-frontend . --no-cache
-                        sudo /usr/bin/docker save codiki-frontend:latest -o ./codiki-frontend.tar
-                        sudo chown jenkins:jenkins ./codiki-frontend.tar
-                        chmod 644 ./codiki-frontend.tar
-                    """
-                }
-            }
-        }
-        stage('Deploy') {
-            steps {
-                sshPublisher(
-                    publishers: [
-                        sshPublisherDesc(
-                            configName: 'DebianServer [codiki]',
-                            transfers: [
-                                sshTransfer(
-                                    cleanRemote: false,
-                                    excludes: '',
-                                    execCommand: '',
-                                    execTimeout: 120000,
-                                    flatten: false,
-                                    makeEmptyDirs: false,
-                                    noDefaultExcludes: false,
-                                    patternSeparator: '[, ]+',
-                                    remoteDirectory: '',
-                                    remoteDirectorySDF: false,
-                                    removePrefix: '',
-                                    sourceFiles: 'codiki-frontend.tar,docker-compose.yml'
-                                ),
-                                sshTransfer(
-                                    cleanRemote: false,
-                                    excludes: '',
-                                    execCommand: """
-                                        cd /opt/codiki
-                                        sudo /usr/bin/docker load < /opt/codiki/codiki-frontend.tar
-                                        sudo /usr/bin/docker compose down
-                                        sudo /usr/bin/docker compose up --detach
-                                    """,
-                                    execTimeout: 120000,
-                                    flatten: false,
-                                    makeEmptyDirs: false,
-                                    noDefaultExcludes: false,
-                                    patternSeparator: '[, ]+',
-                                    remoteDirectory: '',
-                                    remoteDirectorySDF: false,
-                                    removePrefix: '',
-                                    sourceFiles: ''
-                                )
-                            ],
-                            usePromotionTimestamp: false,
-                            useWorkspaceInPromotion: false,
-                            verbose: true
-                        )
-                    ]
-                )
-            }
-        }
-    }
-}