From d8ceb8617afd71ac3defe456aa04a7c6f8cdafa1 Mon Sep 17 00:00:00 2001 From: staffadmin Date: Sat, 23 Nov 2024 21:20:48 +0100 Subject: [PATCH] [Public OK ] --- .../workflows/build_push_internal_docker.yml | 3 +- Dockerfile | 42 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml index 02887c2..78435d2 100644 --- a/.gitea/workflows/build_push_internal_docker.yml +++ b/.gitea/workflows/build_push_internal_docker.yml @@ -45,8 +45,7 @@ jobs: export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1) docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest - docker images - echo "${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" + echo "docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION" docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:$VERSION docker push ${{ vars.REGISTRY_DOCKER }}/${{ secrets.GIT_USER_REPO }}/${{ env.DOCKER_IMAGE_NAME }}:latest diff --git a/Dockerfile b/Dockerfile index abe4a80..3bddc19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,27 +4,27 @@ FROM debian:bullseye ENV NODE_MAJOR 16 -# install dependancies packages -RUN apt-get update \ - && apt-get install -y curl \ - dnsutils \ - git \ - ca-certificates \ - gnupg +# # install dependancies packages +# RUN apt-get update \ +# && apt-get install -y curl \ +# dnsutils \ +# git \ +# ca-certificates \ +# gnupg -# NODE -RUN install -m 0755 -d /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -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 +# # NODE +# RUN install -m 0755 -d /etc/apt/keyrings +# RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +# 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 -# DOCKER -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg -RUN chmod a+r /etc/apt/keyrings/docker.gpg -RUN 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" | tee /etc/apt/sources.list.d/docker.list > /dev/null +# # DOCKER +# RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg +# RUN chmod a+r /etc/apt/keyrings/docker.gpg +# RUN 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" | tee /etc/apt/sources.list.d/docker.list > /dev/null -RUN apt-get update \ - && apt-get install -y nodejs \ - docker-ce \ - docker-ce-cli \ - containerd.io \ - docker-buildx-plugin \ No newline at end of file +# RUN apt-get update \ +# && apt-get install -y nodejs \ +# docker-ce \ +# docker-ce-cli \ +# containerd.io \ +# docker-buildx-plugin \ No newline at end of file