Skip to content

Commit

Permalink
Merge pull request #220 from Gottox/fix/alpine-container
Browse files Browse the repository at this point in the history
Fix/alpine container
  • Loading branch information
Gottox authored Apr 7, 2024
2 parents cdcd6dc + 6d8679f commit 84849e2
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
- uses: actions/checkout@v3
- name: configure
run: |
apk add --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing muon
apk add clang16-extra-tools
meson setup /tmp/build \
-Dwerror=true \
-Dexamples=true \
Expand Down Expand Up @@ -60,7 +58,6 @@ jobs:
- uses: actions/checkout@v3
- name: configure
run: |
apk add zlib-dev lz4-dev xz-dev zstd-dev
CC=gcc meson setup /tmp/build \
-Dwerror=true \
-Dexamples=true \
Expand All @@ -87,7 +84,6 @@ jobs:
- uses: actions/checkout@v3
- name: configure
run: |
apk add zlib-dev lz4-dev xz-dev zstd-dev
CC=clang meson setup /tmp/build \
-Dwerror=true \
-Dexamples=false \
Expand Down
32 changes: 28 additions & 4 deletions common/build_utils/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
ARG BASE_IMAGE=alpine
#ARG BASE_IMAGE=i386/alpine
FROM ${BASE_IMAGE}:3.18
FROM ${BASE_IMAGE}:3.19

RUN apk add --no-cache gcc g++ clang16 clang16-analyzer meson musl-dev git \
RUN apk add --no-cache \
gcc \
g++ \
clang17 \
clang17-extra-tools \
clang17-analyzer \
meson \
musl-dev \
git \
compiler-rt
RUN apk add --no-cache curl-dev fuse fuse3-dev fuse-dev squashfs-tools attr doxygen \
graphviz valgrind
RUN apk add --no-cache \
curl-dev \
fuse3-dev \
fuse-dev \
zlib-dev \
lz4-dev \
xz-dev \
zstd-dev \
squashfs-tools \
attr \
doxygen \
graphviz \
valgrind
RUN apk add --no-cache \
--repository https://dl-cdn.alpinelinux.org/alpine/edge/main \
--repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \
pkgconf \
muon

WORKDIR /host

0 comments on commit 84849e2

Please sign in to comment.