diff options
| author | dakkar <dakkar@thenautilus.net> | 2025-02-09 11:26:51 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2025-02-09 11:26:51 +0000 |
| commit | ae862f79fb0a961c4f9dec50260cc7c360642391 (patch) | |
| tree | b64c550278f8ab2fe9f0b105285ff37751610ac9 | |
| parent | merge: 2024.11.2, for real (!846) (diff) | |
| parent | pin corepack version (diff) | |
| download | sharkey-ae862f79fb0a961c4f9dec50260cc7c360642391.tar.gz sharkey-ae862f79fb0a961c4f9dec50260cc7c360642391.tar.bz2 sharkey-ae862f79fb0a961c4f9dec50260cc7c360642391.zip | |
merge: pin corepack version (!885)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/885
Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4db8bda32e..4b80ba9728 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,13 @@ testCommit: - redis variables: POSTGRES_PASSWORD: ci + COREPACK_DEFAULT_TO_LATEST: 0 script: - apt-get update && apt-get install -y git wget curl build-essential python3 ffmpeg - cp .config/ci.yml .config/default.yml - cp .config/ci.yml .config/test.yml - corepack enable - - corepack prepare pnpm@latest --activate + - corepack install - git submodule update --init - pnpm install --frozen-lockfile - pnpm run build diff --git a/Dockerfile b/Dockerfile index 8f7f8c0805..aff4074079 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ FROM node:${NODE_VERSION} as build RUN apk add git linux-headers build-base ENV PYTHONUNBUFFERED=1 +ENV COREPACK_DEFAULT_TO_LATEST=0 RUN apk add --update python3 && ln -sf python3 /usr/bin/python RUN apk add py3-pip py3-setuptools @@ -35,6 +36,7 @@ FROM node:${NODE_VERSION} ARG UID="991" ARG GID="991" +ENV COREPACK_DEFAULT_TO_LATEST=0 RUN apk add ffmpeg tini jemalloc \ && corepack enable \ |