diff --git a/.drone.star b/.drone.star index fafb7914..1ab665c3 100644 --- a/.drone.star +++ b/.drone.star @@ -1,6 +1,7 @@ def main(ctx): versions = [ "latest", + "22", "20", "18", "16", diff --git a/latest/Dockerfile.amd64 b/latest/Dockerfile.amd64 index 0ba8ff2f..2ed7f1d6 100644 --- a/latest/Dockerfile.amd64 +++ b/latest/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM owncloud/ubuntu:20.04-amd64@sha256:de7decaa013d5933c855ed2475c36b3d5991a821e847da4be2ceeecb68f3093d +FROM owncloud/ubuntu:22.04-amd64@sha256:4c7cd5f9c40b28cd12ce780d7b34cb18ad4a6c7039bbb764d23edc8498ad2e6b LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ @@ -14,7 +14,7 @@ ARG RETRY_VERSION # renovate: datasource=github-releases depName=owncloud-ci/retry ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" # renovate: datasource=npm depName=pnpm -ENV PNPM_VERSION="${PNPM_VERSION:-9.15.9}" +ENV PNPM_VERSION="${PNPM_VERSION:-10.11.0}" VOLUME ["/var/www/owncloud"] @@ -23,7 +23,7 @@ RUN apt-get update -y && \ curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ chmod 755 /usr/local/bin/retry && \ curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/node.list && \ + curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ apt-get update -y && \ apt-get install -y nodejs && \ wget -q -P /tmp https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \ diff --git a/latest/Dockerfile.arm64v8 b/latest/Dockerfile.arm64v8 index 77c706c6..dc646a1d 100644 --- a/latest/Dockerfile.arm64v8 +++ b/latest/Dockerfile.arm64v8 @@ -1,4 +1,4 @@ -FROM owncloud/ubuntu:20.04-arm64v8@sha256:f2bf53708c8e5393371e106e621e8b458557da2bf7d056a79dc3b3a1ad98cb06 +FROM owncloud/ubuntu:22.04-arm64v8@sha256:21fe74802e2a3ac9d73ba854c6551dbddeb6304c69b89150ae215b2ea7566930 LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ @@ -14,7 +14,7 @@ ARG RETRY_VERSION # renovate: datasource=github-releases depName=owncloud-ci/retry ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" # renovate: datasource=npm depName=pnpm -ENV PNPM_VERSION="${PNPM_VERSION:-9.15.9}" +ENV PNPM_VERSION="${PNPM_VERSION:-10.11.0}" VOLUME ["/var/www/owncloud"] @@ -23,7 +23,7 @@ RUN apt-get update -y && \ curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ chmod 755 /usr/local/bin/retry && \ curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/node.list && \ + curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ apt-get update -y && \ apt-get install -y nodejs && \ apt-get clean && \ diff --git a/v22/Dockerfile.amd64 b/v22/Dockerfile.amd64 new file mode 100644 index 00000000..2ed7f1d6 --- /dev/null +++ b/v22/Dockerfile.amd64 @@ -0,0 +1,37 @@ +FROM owncloud/ubuntu:22.04-amd64@sha256:4c7cd5f9c40b28cd12ce780d7b34cb18ad4a6c7039bbb764d23edc8498ad2e6b + +LABEL maintainer="ownCloud GmbH " \ + org.opencontainers.image.title="ownCloud CI NodeJS" \ + org.opencontainers.image.vendor="ownCloud GmbH" \ + org.opencontainers.image.authors="ownCloud GmbH" \ + org.opencontainers.image.description="ownCloud CI NodeJS" \ + org.opencontainers.image.documentation="https://github.com/owncloud-ci/nodejs.git" \ + org.opencontainers.image.url="https://github.com/owncloud-ci/nodejs" \ + org.opencontainers.image.source="https://github.com/owncloud-ci/nodejs" + +ARG RETRY_VERSION + +# renovate: datasource=github-releases depName=owncloud-ci/retry +ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" +# renovate: datasource=npm depName=pnpm +ENV PNPM_VERSION="${PNPM_VERSION:-10.11.0}" + +VOLUME ["/var/www/owncloud"] + +RUN apt-get update -y && \ + apt-get install -y gettext git-core build-essential libfontconfig libpng16-16 lsb-release firefox && \ + curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ + chmod 755 /usr/local/bin/retry && \ + curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ + apt-get update -y && \ + apt-get install -y nodejs && \ + wget -q -P /tmp https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \ + apt install -y /tmp/google-chrome-stable_current_amd64.deb && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN npm install --silent -g yarn npx "pnpm@$PNPM_VERSION" --force + +COPY rootfs / +WORKDIR /var/www/owncloud diff --git a/v22/Dockerfile.arm64v8 b/v22/Dockerfile.arm64v8 new file mode 100644 index 00000000..dc646a1d --- /dev/null +++ b/v22/Dockerfile.arm64v8 @@ -0,0 +1,35 @@ +FROM owncloud/ubuntu:22.04-arm64v8@sha256:21fe74802e2a3ac9d73ba854c6551dbddeb6304c69b89150ae215b2ea7566930 + +LABEL maintainer="ownCloud GmbH " \ + org.opencontainers.image.title="ownCloud CI NodeJS" \ + org.opencontainers.image.vendor="ownCloud GmbH" \ + org.opencontainers.image.authors="ownCloud GmbH" \ + org.opencontainers.image.description="ownCloud CI NodeJS" \ + org.opencontainers.image.documentation="https://github.com/owncloud-ci/nodejs.git" \ + org.opencontainers.image.url="https://github.com/owncloud-ci/nodejs" \ + org.opencontainers.image.source="https://github.com/owncloud-ci/nodejs" + +ARG RETRY_VERSION + +# renovate: datasource=github-releases depName=owncloud-ci/retry +ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" +# renovate: datasource=npm depName=pnpm +ENV PNPM_VERSION="${PNPM_VERSION:-10.11.0}" + +VOLUME ["/var/www/owncloud"] + +RUN apt-get update -y && \ + apt-get install -y gettext git-core build-essential libfontconfig libpng16-16 lsb-release firefox && \ + curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ + chmod 755 /usr/local/bin/retry && \ + curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ + apt-get update -y && \ + apt-get install -y nodejs && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN npm install --silent -g yarn npx "pnpm@$PNPM_VERSION" --force + +COPY rootfs / +WORKDIR /var/www/owncloud diff --git a/v22/manifest.tmpl b/v22/manifest.tmpl new file mode 100644 index 00000000..0390a6d4 --- /dev/null +++ b/v22/manifest.tmpl @@ -0,0 +1,11 @@ +image: owncloudci/nodejs:22 +manifests: + - image: owncloudci/nodejs:22-amd64 + platform: + architecture: amd64 + os: linux + - image: owncloudci/nodejs:22-arm64v8 + platform: + architecture: arm64 + variant: v8 + os: linux diff --git a/v22/rootfs/.keep b/v22/rootfs/.keep new file mode 100644 index 00000000..e69de29b