diff --git a/.woodpecker.yml b/.woodpecker.yml index 884ec7e..a940df7 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,14 +3,12 @@ steps: docker-build: image: woodpeckerci/plugin-docker-buildx environment: - - CI_TZ="Europe/Paris" - - CI_NODE_MAJOR=18 - CI_DEBIAN_VERSION=12 + - CI_NODE_MAJOR=18 settings: build_args_from_env: - CI_TZ - CI_NODE_MAJOR - - CI_DEBIAN_VERSION repo: git.van-hemmen.com/guillaumehemmen/debian-node-firebase tags: latest,debian_${CI_DEBIAN_VERSION}-node_${CI_NODE_MAJOR} registry: git.van-hemmen.com diff --git a/Dockerfile b/Dockerfile index a23eab0..d01d49a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,57 +1,52 @@ -ARG CI_TZ -ARG CI_NODE_MAJOR -ARG CI_DEBIAN_VERSION - -FROM debian:${CI_DEBIAN_VERSION} +FROM debian:12 LABEL maintainer="guillaume@van-hemmen.com" -RUN echo "The value of CI_TZ is ${CI_TZ}" -RUN echo "The value of CI_NODE_MAJOR is ${CI_NODE_MAJOR}" -RUN echo "The value of CI_DEBIAN_VERSION is ${CI_DEBIAN_VERSION}" +ARG ARG_TZ="Europe/Paris" +ARG ARG_NODE_MAJOR=18 -#RUN ln -snf /usr/share/zoneinfo/$CI_TZ /etc/localtime && echo $CI_TZ > /etc/timezone && \ -# apt-get update && 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 && \ -# echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${CI_NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ -# apt-get update && apt-get install -y nodejs sudo && \ -# apt-get install -y \ -# ca-certificates \ -# fonts-liberation \ -# libappindicator3-1 \ -# libasound2 \ -# libatk-bridge2.0-0 \ -# libatk1.0-0 \ -# libc6 \ -# libcairo2 \ -# libcups2 \ -# libdbus-1-3 \ -# libexpat1 \ -# libfontconfig1 \ -# libgbm1 \ -# libgcc1 \ -# libglib2.0-0 \ -# libgtk-3-0 \ -# libnspr4 \ -# libnss3 \ -# libpango-1.0-0 \ -# libpangocairo-1.0-0 \ -# libstdc++6 \ -# libx11-6 \ -# libx11-xcb1 \ -# libxcb1 \ -# libxcomposite1 \ -# libxcursor1 \ -# libxdamage1 \ -# libxext6 \ -# libxfixes3 \ -# libxi6 \ -# libxrandr2 \ -# libxrender1 \ -# libxss1 \ -# libxtst6 \ -# lsb-release \ -# wget -# -#RUN curl -sL firebase.tools | bash +RUN ln -snf /usr/share/zoneinfo/$CI_TZ /etc/localtime && echo $CI_TZ > /etc/timezone && \ + apt-get update && 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 && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${CI_NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && apt-get install -y nodejs sudo && \ + apt-get install -y \ + ca-certificates \ + fonts-liberation \ + libappindicator3-1 \ + libasound2 \ + libatk-bridge2.0-0 \ + libatk1.0-0 \ + libc6 \ + libcairo2 \ + libcups2 \ + libdbus-1-3 \ + libexpat1 \ + libfontconfig1 \ + libgbm1 \ + libgcc1 \ + libglib2.0-0 \ + libgtk-3-0 \ + libnspr4 \ + libnss3 \ + libpango-1.0-0 \ + libpangocairo-1.0-0 \ + libstdc++6 \ + libx11-6 \ + libx11-xcb1 \ + libxcb1 \ + libxcomposite1 \ + libxcursor1 \ + libxdamage1 \ + libxext6 \ + libxfixes3 \ + libxi6 \ + libxrandr2 \ + libxrender1 \ + libxss1 \ + libxtst6 \ + lsb-release \ + wget + +RUN curl -sL firebase.tools | bash