Skip to content

Commit cb078f0

Browse files
author
Marcus Müller
committedAug 30, 2024·
move config back into file
Signed-off-by: Marcus Müller <mueller@baseband.digital>
1 parent b96397c commit cb078f0

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed
 

‎ci/ci-fedora-40-3.10/Dockerfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,15 @@ RUN mkdir /tmp/sccache/ \
9292
&& tar xf /tmp/sccache.tgz \
9393
&& cp */sccache /usr/bin \
9494
&& rm -rf /tmp/sccache.tgz /tmp/sccache \
95-
&& mkdir -p /etc/sccache/
96-
COPY ci/config /etc/sccache/config
95+
&& mkdir -p /etc/sccache/ \
96+
# copy annoyingly would need to put the shared file into a separate image
97+
# or set up a builder context, and that just seems to be more trouble than it's
98+
# worth, sooooo:
99+
&& printf '[cache.s3]\n' > /etc/sccache/config \
100+
&& printf 'use_ssl = true\n' >> /etc/sccache/config \
101+
&& printf 'no_credentials = false\n' >> /etc/sccache/config \
102+
&& printf 'server_side_encryption = false\n' >> /etc/sccache/config
103+
97104
ENV SCCACHE_CONF="/etc/sccache/config"
98105
# anything works, but needs to be set:
99106
ENV AWS_REGION="non-AWS"

‎ci/config

-8
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.