diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd index 1f87dc1..f6ea7fa 100644 --- a/Jenkinsfile.cd +++ b/Jenkinsfile.cd @@ -163,7 +163,7 @@ pipeline { echo "Deploying backend ${BUILD_NUMBER}" - BACKEND_TAG=latest FRONTEND_TAG=latest docker-compose up -d + BACKEND_TAG=latest FRONTEND_TAG=latest docker compose up -d ''' } } diff --git a/jenkins/Dockerfile.jenkins b/jenkins/Dockerfile.jenkins index b672f76..cbbe17f 100644 --- a/jenkins/Dockerfile.jenkins +++ b/jenkins/Dockerfile.jenkins @@ -3,10 +3,15 @@ FROM jenkins/jenkins:lts USER root RUN apt-get update \ - && apt-get install -y docker.io curl \ - && curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64 \ - -o /usr/local/bin/docker-compose \ - && chmod +x /usr/local/bin/docker-compose \ + && apt-get install -y ca-certificates curl gnupg \ + && install -m 0755 -d /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/debian/gpg \ + | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \ + && chmod a+r /etc/apt/keyrings/docker.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo \"$VERSION_CODENAME\") stable" \ + > /etc/apt/sources.list.d/docker.list \ + && apt-get update \ + && apt-get install -y docker-ce-cli docker-compose-plugin \ && rm -rf /var/lib/apt/lists/* USER jenkins