From 894a7bb2693acbee127005b3ffdc4671c653168e Mon Sep 17 00:00:00 2001 From: Witalij Poljatchek Date: Wed, 10 Jan 2024 18:18:00 +0100 Subject: [PATCH] check jenkins --- Dockerfile | 3 +-- Dockerfile copy | 15 --------------- Dockerfile copy 2 | 12 ------------ Dockerfile.1 | 5 ----- Dockerfile.test | 13 ------------- Jenkinsfile | 3 +++ 6 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 Dockerfile copy delete mode 100644 Dockerfile copy 2 delete mode 100644 Dockerfile.1 delete mode 100644 Dockerfile.test diff --git a/Dockerfile b/Dockerfile index 90d792b..9779cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/inbound-agent +FROM ubuntu:22.04 USER root @@ -13,4 +13,3 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor RUN sudo curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh ;\ sudo bash nodesource_setup.sh ;\ apt-get -y install nodejs -USER jenkins diff --git a/Dockerfile copy b/Dockerfile copy deleted file mode 100644 index 9779cd8..0000000 --- a/Dockerfile copy +++ /dev/null @@ -1,15 +0,0 @@ -FROM ubuntu:22.04 - -USER root - -RUN apt-get update ;\ - apt-get -y install lsb-release procps wget sudo git apt-transport-https ca-certificates curl gnupg2 software-properties-common - -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg ;\ - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | sudo tee /etc/apt/sources.list.d/docker.list ;\ - apt-get update ;\ - apt-get -y install docker-ce docker-ce-cli docker-ce-rootless-extras docker-buildx-plugin - -RUN sudo curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh ;\ - sudo bash nodesource_setup.sh ;\ - apt-get -y install nodejs diff --git a/Dockerfile copy 2 b/Dockerfile copy 2 deleted file mode 100644 index 21b89f3..0000000 --- a/Dockerfile copy 2 +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:21-bookworm AS build - -RUN node -v -WORKDIR /app -COPY . . -RUN npm install -RUN npm run build - -FROM nginx -COPY --from=build /app/dist/ /usr/share/nginx/html/ -RUN rm /etc/nginx/conf.d/default.conf -COPY _nginx/nginx.conf /etc/nginx/conf.d \ No newline at end of file diff --git a/Dockerfile.1 b/Dockerfile.1 deleted file mode 100644 index 6eef6bc..0000000 --- a/Dockerfile.1 +++ /dev/null @@ -1,5 +0,0 @@ -FROM node:21-bookworm AS build - -RUN node -v -WORKDIR /app -COPY . . \ No newline at end of file diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index f6deff2..0000000 --- a/Dockerfile.test +++ /dev/null @@ -1,13 +0,0 @@ -FROM jenkins/inbound-agent - -USER root -RUN apt-get update ;\ - apt-get -y install npm procps wget sudo git apt-transport-https ca-certificates curl gnupg2 software-properties-common ;\ - curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg ;\ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" |tee /etc/apt/sources.list.d/docker.list > /dev/null ;\ - apt-get -y update ;\ - apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin docker-compose - -RUN sudo curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - && sudo apt install nodejs -y - -USER jenkins \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index f1dd160..021c586 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,9 @@ pipeline { sh ''' sudo npm install sudo npm run build + sudo echo "-------------------------------------------" + sudo date + sudo echo "-------------------------------------------" #sudo docker build -t bbuddy/bbuddy_backend-dev:latest . ''' }