Skip to content

Commit d7ea88d

Browse files
authored
Move to chainguard/wolfi-base (#3252)
1 parent 9f4ad42 commit d7ea88d

File tree

4 files changed

+52
-4
lines changed

4 files changed

+52
-4
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.gradle
22
bin
3+
.idea
4+
.parcel-cache
35
.includepath
46
.ignorepath
57
.settings

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
# and takes longer to build but that is worth it.
1111
FROM bitnami/minideb:buster AS base
1212

13-
RUN echo "deb http://archive.debian.org/debian/ buster main" > /etc/apt/sources.list && \
14-
echo "deb http://archive.debian.org/debian-security/ buster/updates main" >> /etc/apt/sources.list
13+
RUN install_packages apt-transport-https gnupg2 ca-certificates
14+
15+
RUN echo "deb https://archive.debian.org/debian/ buster main" > /etc/apt/sources.list && \
16+
echo "deb https://archive.debian.org/debian-security/ buster/updates main" >> /etc/apt/sources.list
1517

1618
# TODO install_packages calls apt-get update and then nukes the list files after. We should avoid multiple calls to apt-get update.....
1719
# We could probably fix this by running the update and installs ourself with `RUN --mount type=cache` but that is "experimental"
1820

19-
RUN install_packages apt-transport-https gnupg2 ca-certificates
2021
COPY .docker/apt/keys/nodesource.gpg /
2122
RUN apt-key add /nodesource.gpg
2223
COPY .docker/apt/sources.list.d/nodesource.list /etc/apt/sources.list.d/

air_gapped/Dockerfile

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
1-
FROM docker.elastic.co/docs/preview:latest
1+
FROM docker.elastic.co/docs/preview:latest AS build
22

33
COPY air_gapped/work/target_repo.git /docs_build/.repos/target_repo.git
44

5+
FROM chainguard/wolfi-base:latest
6+
#FROM perl:5.42-bookworm
7+
RUN apk update
8+
RUN apk add perl
9+
RUN apk add curl
10+
RUN apk add perl-app-cpanminus
11+
12+
RUN apk add gcc make git patch perl-dev wget
13+
RUN apk add openssl-dev
14+
RUN apk add zlib-dev
15+
RUN apk add perl-net-ssleay
16+
17+
ENV PERL5LIB=/usr/local/lib/perl5
18+
ENV PATH=/usr/local/bin:$PATH
19+
20+
WORKDIR /
21+
RUN cpanm -n XML::LibXML
22+
RUN cpanm -n File::Copy::Recursive
23+
RUN cpanm -n Path::Class
24+
RUN cpanm -n Parallel::ForkManager
25+
RUN cpanm -n YAML
26+
#RUN apt update -y
27+
#RUN apt-get install -y perl
28+
#RUN apt-get install -y nginx
29+
#RUN apt-get install -y nodejs
30+
#RUN apt-get install -y git
31+
32+
#RUN apt-get install -y libxml-simple-perl
33+
#RUN apt-get install -y libfile-copy-recursive-perl
34+
#RUN apt-get install -y libpath-class-perl
35+
#RUN apt-get install -y libcapture-tiny-perl
36+
#RUN apt-get install -y libparallel-forkmanager-perl
37+
#RUN apt-get install -y libyaml-perl
38+
39+
RUN apk add nginx
40+
RUN apk add nodejs
41+
42+
COPY --from=build /docs_build /docs_build
43+
COPY --from=build /node_modules /node_modules
44+
45+
RUN adduser -D nginx
46+
RUN mkdir -p /var/lib/nginx/tmp/
47+
548
CMD ["/docs_build/build_docs.pl", "--in_standard_docker", "--gapped", "--preview"]

preview/git.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ const toStringHandler = (resolve, reject, onMissing) => (err, stdout) => {
254254
if (err) {
255255
if (err.message.includes("Not a valid object name")) {
256256
onMissing("missing");
257+
} else if (err.message.includes("does not exist in")) {
258+
onMissing("missing");
257259
} else {
258260
reject(err);
259261
}

0 commit comments

Comments
 (0)