Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 01e08ff

Browse files
authored
bump comby version to 1.7.1 (#35830)
1 parent 9c0909f commit 01e08ff

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Diff for: .hadolint.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ ignored:
1111
- DL3018
1212
# Noisy: Multiple consecutive `RUN` instructions. Consider consolidation.
1313
- DL3059
14+
# Noisy: this lint triggers after unrelated changes are made, so @rvantonder decided to suppress it.
15+
- DL3047

Diff for: cmd/searcher/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
FROM sourcegraph/alpine-3.14:142406_2022-04-14_8836ac3499f4@sha256:2a2d1cbaec78882661fe1aa5b0a4af0c23a37be2ea9ff8aadc2da5b80852c233
77

8-
RUN apk --no-cache add pcre sqlite-libs
8+
RUN apk --no-cache add pcre sqlite-libs libev
99

1010
# The comby/comby image is a small binary-only distribution. See the bin and src directories
1111
# here: https://github.com/comby-tools/comby/tree/master/dockerfiles/alpine
1212
# hadolint ignore=DL3022
13-
COPY --from=comby/comby:0.18.4@sha256:b47ce282778bfea7f80d45f5ef0cc546ba0d6347baccebaf171a7866143b2593 /usr/local/bin/comby /usr/local/bin/comby
13+
COPY --from=comby/comby:1.7.1@sha256:6a581342b15e0032e6293ea2f4827af70f33646106b7c8900315bcc7d4b63b1a /usr/local/bin/comby /usr/local/bin/comby
1414

1515
ARG COMMIT_SHA="unknown"
1616
ARG DATE="unknown"

Diff for: cmd/server/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ RUN apk add --no-cache --verbose \
6060
'redis>=5.0' \
6161
python2 \
6262
python3 \
63-
'nginx>=1.18.0' openssh-client pcre sqlite-libs su-exec 'nodejs-current>=14.5.0' \
63+
'nginx>=1.18.0' openssh-client pcre sqlite-libs libev su-exec 'nodejs-current>=14.5.0' \
6464
# We require libstdc++ for p4-fusion
6565
libstdc++
6666

6767
# IMPORTANT: If you update the syntect_server version below, you MUST confirm
6868
# the ENV variables from its Dockerfile (https://github.com/sourcegraph/syntect_server/blob/master/Dockerfile)
6969
# have been appropriately set in cmd/server/shared/shared.go.
7070
# hadolint ignore=DL3022
71-
COPY --from=comby/comby:0.18.4@sha256:b47ce282778bfea7f80d45f5ef0cc546ba0d6347baccebaf171a7866143b2593 /usr/local/bin/comby /usr/local/bin/comby
71+
COPY --from=comby/comby:1.7.1@sha256:6a581342b15e0032e6293ea2f4827af70f33646106b7c8900315bcc7d4b63b1a /usr/local/bin/comby /usr/local/bin/comby
7272
# hadolint ignore=DL3022
7373
COPY --from=docker.io/sourcegraph/syntect_server:21-08-31_c330964@sha256:759f331a474d2a67b811a1b374b0b24a4661446a2d8e9b211f51ea8ae95e1130 /syntect_server /usr/local/bin/
7474

@@ -114,6 +114,7 @@ COPY --from=coursier /usr/local/bin/coursier /usr/local/bin/coursier
114114

115115
# This is a trick to include libraries required by p4,
116116
# please refer to https://blog.tilander.org/docker-perforce/
117+
# hadolint ignore=DL4006
117118
RUN wget -O - https://github.com/jtilander/p4d/raw/4600d741720f85d77852dcca7c182e96ad613358/lib/lib-x64.tgz | tar zx --directory /
118119

119120
# hadolint ignore=DL3022

0 commit comments

Comments
 (0)