Skip to content

Commit dda94ff

Browse files
committed
recapture tests due to libvips
1 parent fb970c1 commit dda94ff

File tree

22 files changed

+117
-45
lines changed

22 files changed

+117
-45
lines changed

test/results/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN gem update --system --no-document && \
1919
gem install -N bundler
2020

2121
# Install base packages
22-
RUN apk add --no-cache curl jemalloc postgresql-client tzdata
22+
RUN apk add --no-cache curl jemalloc postgresql-client tzdata vips
2323

2424
# Set production environment
2525
ENV BUNDLE_DEPLOYMENT="1" \
@@ -32,7 +32,7 @@ ENV BUNDLE_DEPLOYMENT="1" \
3232
FROM base AS build
3333

3434
# Install packages needed to build gems and node modules
35-
RUN apk add --no-cache build-base gyp libpq-dev pkgconfig python3 yaml-dev
35+
RUN apk add --no-cache build-base gyp libffi-dev libpq-dev pkgconfig python3 yaml-dev
3636

3737
# Install JavaScript dependencies
3838
ARG NODE_VERSION=xxx
@@ -68,7 +68,7 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
6868
FROM base
6969

7070
# Install packages needed for deployment
71-
RUN apk add --no-cache libpq
71+
RUN apk add --no-cache imagemagick libpq vips
7272

7373
# Copy built artifacts: gems, application
7474
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/api/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN gem update --system --no-document && \
3737

3838
# Install base packages
3939
RUN apt-get update -qq && \
40-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
40+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
4141
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4242

4343
# Set production environment
@@ -52,7 +52,7 @@ FROM base AS build
5252

5353
# Install packages needed to build gems
5454
RUN apt-get update -qq && \
55-
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
55+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev pkg-config && \
5656
rm -rf /var/lib/apt/lists /var/cache/apt/archives
5757

5858
# Install application gems
@@ -71,6 +71,10 @@ RUN bundle exec bootsnap precompile app/ lib/
7171
# Final stage for app image
7272
FROM base
7373

74+
# Install packages needed for deployment
75+
RUN apt-get update -qq && \
76+
apt-get install --no-install-recommends -y imagemagick libvips && \
77+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
7478

7579
# Copy built artifacts: gems, application
7680
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/bun/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config unzip && \
38+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev pkg-config unzip && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install Bun
@@ -67,6 +67,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
6767
# Final stage for app image
6868
FROM base
6969

70+
# Install packages needed for deployment
71+
RUN apt-get update -qq && \
72+
apt-get install --no-install-recommends -y imagemagick libvips && \
73+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
7074

7175
# Copy built artifacts: gems, application
7276
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/cache/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN gem update --system --no-document && \
2222
RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
2323
--mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
2424
apt-get update -qq && \
25-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3
25+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3
2626

2727
# Set production environment
2828
ENV BUNDLE_DEPLOYMENT="1" \
@@ -38,7 +38,7 @@ FROM base AS build
3838
RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
3939
--mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
4040
apt-get update -qq && \
41-
apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3
41+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev node-gyp pkg-config python-is-python3
4242

4343
# Install JavaScript dependencies
4444
ARG NODE_VERSION=xxx
@@ -79,6 +79,11 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
7979
# Final stage for app image
8080
FROM base
8181

82+
# Install packages needed for deployment
83+
RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
84+
--mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
85+
apt-get update -qq && \
86+
apt-get install --no-install-recommends -y imagemagick libvips
8287

8388
# Copy built artifacts: gems, application
8489
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/esbuild/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems and node modules
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \
38+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev node-gyp pkg-config python-is-python3 && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install JavaScript dependencies
@@ -70,6 +70,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
7070
# Final stage for app image
7171
FROM base
7272

73+
# Install packages needed for deployment
74+
RUN apt-get update -qq && \
75+
apt-get install --no-install-recommends -y imagemagick libvips && \
76+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
7377

7478
# Copy built artifacts: gems, application
7579
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/execjs_importmap/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages needed to install nodejs
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -42,7 +42,7 @@ FROM base AS build
4242

4343
# Install packages needed to build gems
4444
RUN apt-get update -qq && \
45-
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
45+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev pkg-config && \
4646
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4747

4848
# Build options
@@ -67,6 +67,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
6767
# Final stage for app image
6868
FROM base
6969

70+
# Install packages needed for deployment
71+
RUN apt-get update -qq && \
72+
apt-get install --no-install-recommends -y imagemagick libvips && \
73+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
7074

7175
# Copy built artifacts: gems, application
7276
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/execjs_node/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages needed to install nodejs
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -42,7 +42,7 @@ FROM base AS build
4242

4343
# Install packages needed to build gems and node modules
4444
RUN apt-get update -qq && \
45-
apt-get install --no-install-recommends -y build-essential libyaml-dev node-gyp pkg-config python-is-python3 && \
45+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev node-gyp pkg-config python-is-python3 && \
4646
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4747

4848
# Install yarn
@@ -75,6 +75,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
7575
# Final stage for app image
7676
FROM base
7777

78+
# Install packages needed for deployment
79+
RUN apt-get update -qq && \
80+
apt-get install --no-install-recommends -y imagemagick libvips && \
81+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
7882

7983
# Copy built artifacts: gems, application
8084
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/litefs/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
38+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev pkg-config && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install application gems
@@ -63,7 +63,7 @@ COPY config/litefs.yml /etc/litefs.yml
6363

6464
# Install packages needed for deployment
6565
RUN apt-get update -qq && \
66-
apt-get install --no-install-recommends -y ca-certificates fuse3 sudo && \
66+
apt-get install --no-install-recommends -y ca-certificates fuse3 imagemagick libvips sudo && \
6767
rm -rf /var/lib/apt/lists /var/cache/apt/archives
6868

6969
# Copy built artifacts: gems, application

test/results/litestream/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl libjemalloc2 sqlite3 && \
23+
apt-get install --no-install-recommends -y curl libjemalloc2 libvips sqlite3 && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential libyaml-dev pkg-config && \
38+
apt-get install --no-install-recommends -y build-essential libffi-dev libyaml-dev pkg-config && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install application gems
@@ -57,6 +57,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
5757
# Final stage for app image
5858
FROM base
5959

60+
# Install packages needed for deployment
61+
RUN apt-get update -qq && \
62+
apt-get install --no-install-recommends -y imagemagick libvips && \
63+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
6064

6165
# Copy built artifacts: gems, application
6266
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

test/results/mysql/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN gem update --system --no-document && \
2020

2121
# Install base packages
2222
RUN apt-get update -qq && \
23-
apt-get install --no-install-recommends -y curl default-mysql-client libjemalloc2 && \
23+
apt-get install --no-install-recommends -y curl default-mysql-client libjemalloc2 libvips && \
2424
rm -rf /var/lib/apt/lists /var/cache/apt/archives
2525

2626
# Set production environment
@@ -35,7 +35,7 @@ FROM base AS build
3535

3636
# Install packages needed to build gems
3737
RUN apt-get update -qq && \
38-
apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev libyaml-dev && \
38+
apt-get install --no-install-recommends -y build-essential default-libmysqlclient-dev libffi-dev libyaml-dev && \
3939
rm -rf /var/lib/apt/lists /var/cache/apt/archives
4040

4141
# Install application gems
@@ -57,6 +57,10 @@ RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
5757
# Final stage for app image
5858
FROM base
5959

60+
# Install packages needed for deployment
61+
RUN apt-get update -qq && \
62+
apt-get install --no-install-recommends -y imagemagick libvips && \
63+
rm -rf /var/lib/apt/lists /var/cache/apt/archives
6064

6165
# Copy built artifacts: gems, application
6266
COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

0 commit comments

Comments
 (0)