fork of https://github.com/sourcegraph/zoekt
docker: simplify apk add lines (#759)
The images produced are no longer consumed directly by sourcegraph so we
don't have security scanners running on them. Additionally we upgraded
to the latest alpine now. Both combined means we can simplify the apk
add lines.
Test Plan: built locally
docker build -t zoekt .
docker build -t zoekt-indexserver . -f Dockerfile.indexserver
docker build -t zoekt-webserver . -f Dockerfile.webserver
author
Keegan Carruthers-Smith
committer
GitHub
date
(Apr 22, 2024, 4:54 PM +0200)
commit
55b7aeee
55b7aeee2dbb24970a295d378a1cd297da7194e3
parent
8619902b
8619902b5d0d7ff40e6c5558aee085d0869f9050
+5
-9
+2
-4
Dockerfile
+2
-4
Dockerfile
···
15
15
16
16
FROM rust:alpine3.19 AS rust-builder
17
17
18
-
RUN apk update --no-cache && apk upgrade --no-cache && \
19
-
apk add --no-cache git wget musl-dev>=1.1.24-r10 build-base
18
+
RUN apk add --no-cache git wget musl-dev build-base
20
19
21
20
RUN wget -qO- https://github.com/sourcegraph/sourcegraph/archive/0c8aa18eece45922a2b56dc0f94e21b1bb533e7d.tar.gz | tar xz && mv sourcegraph-* sourcegraph
22
21
···
29
28
30
29
FROM alpine:3.19 AS zoekt
31
30
32
-
RUN apk update --no-cache && apk upgrade --no-cache && \
33
-
apk add --no-cache git ca-certificates bind-tools tini jansson wget
31
+
RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget
34
32
35
33
COPY install-ctags-alpine.sh .
36
34
RUN ./install-ctags-alpine.sh && rm install-ctags-alpine.sh
+2
-3
Dockerfile.indexserver
+2
-3
Dockerfile.indexserver
···
1
1
FROM alpine:3.19
2
2
3
-
RUN apk update --no-cache && apk upgrade --no-cache && \
4
-
apk add --no-cache ca-certificates bind-tools tini 'git>=2.38.5-r0' jansson && \
5
-
apk add --upgrade --no-cache 'libcrypto1.1>=1.1.1n-r0' 'libssl1.1>=1.1.1n-r0' 'pcre2>=10.40-r0' 'e2fsprogs>=1.46.6-r0'
3
+
RUN apk add --no-cache ca-certificates bind-tools tini git jansson
4
+
6
5
# Run as non-root user sourcegraph. External volumes should be mounted under /data (which will be owned by sourcegraph).
7
6
RUN mkdir -p /home/sourcegraph
8
7
RUN addgroup -S sourcegraph && adduser -S -G sourcegraph -h /home/sourcegraph sourcegraph && mkdir -p /data && chown -R sourcegraph:sourcegraph /data
+1
-2
Dockerfile.webserver
+1
-2
Dockerfile.webserver
···
1
1
FROM alpine:3.19
2
2
3
-
RUN apk update --no-cache && apk upgrade --no-cache && \
4
-
apk add --no-cache ca-certificates bind-tools tini
3
+
RUN apk add --no-cache ca-certificates bind-tools tini
5
4
6
5
# Run as non-root user sourcegraph. External volumes should be mounted under /data (which will be owned by sourcegraph).
7
6
RUN mkdir -p /home/sourcegraph