feat: add debian-12.6 based image, remove broken ubuntu-2404
This commit is contained in:
parent
0fea8d3168
commit
948294ae2f
4 changed files with 5 additions and 21 deletions
|
@ -20,7 +20,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
image-name: ['ubuntu-2204', 'ubuntu-2404']
|
image-name: ['ubuntu-2204', 'debian-12.6-slim']
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
|
|
|
@ -48,7 +48,7 @@ def build_image(image_name: str, tag: str, image_path: typing.Optional[pathlib.P
|
||||||
image_path = image_path.relative_to(cwd)
|
image_path = image_path.relative_to(cwd)
|
||||||
|
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
f"podman build -t {image_name}:{tag} -f {str(image_path)}",
|
f"podman build --no-cache -t {image_name}:{tag} -f {str(image_path)}",
|
||||||
shell=True,
|
shell=True,
|
||||||
check=True,
|
check=True,
|
||||||
cwd=cwd,
|
cwd=cwd,
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
FROM ubuntu:24.04 as skeleton
|
FROM debian:12.6-slim as skeleton
|
||||||
|
|
||||||
ENV NODE_VERSION "20.12.2"
|
|
||||||
ENV NVM_VERSION "0.37.2"
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
ENV TZ Etc/UTC
|
ENV TZ Etc/UTC
|
||||||
|
@ -15,8 +12,9 @@ RUN apt update && \
|
||||||
git \
|
git \
|
||||||
xz-utils \
|
xz-utils \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
nodejs \
|
||||||
|
npm \
|
||||||
python3 \
|
python3 \
|
||||||
python3-venv \
|
|
||||||
python3-pip \
|
python3-pip \
|
||||||
pipx \
|
pipx \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
|
@ -28,17 +26,3 @@ COPY ./files/registries.conf /etc/containers/registries.conf
|
||||||
FROM skeleton as runner
|
FROM skeleton as runner
|
||||||
|
|
||||||
WORKDIR /runner
|
WORKDIR /runner
|
||||||
|
|
||||||
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
|
|
||||||
|
|
||||||
RUN . $HOME/.nvm/nvm.sh && \
|
|
||||||
nvm install $NODE_VERSION && \
|
|
||||||
nvm use $NODE_VERSION && \
|
|
||||||
nvm cache clear
|
|
||||||
|
|
||||||
ENV NVM_DIR $HOME/.nvm
|
|
||||||
ENV PATH /root/.nvm/versions/node/v$NODE_VERSION/bin:$PATH
|
|
||||||
|
|
||||||
RUN node --version
|
|
||||||
|
|
||||||
RUN corepack enable
|
|
Loading…
Reference in a new issue