Skip to content

Commit 84aa6b4

Browse files
committed
fixup! fixup! Fix CI
1 parent 1626015 commit 84aa6b4

File tree

4 files changed

+21
-39
lines changed

4 files changed

+21
-39
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22
name: CrateDB Docker images test
33
on: [push]
44

5+
permissions:
6+
contents: read
7+
checks: write
8+
statuses: write
9+
510
jobs:
611
multi-arch-build:
712
runs-on: ubuntu-latest
813
strategy:
914
matrix:
10-
arch: [linux/amd64, linux/arm64]
15+
arch: [linux/arm64]
1116
steps:
12-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v6
18+
with:
19+
persist-credentials: false
1320

1421
- name: Set up Python
1522
uses: actions/setup-python@v4
@@ -32,7 +39,8 @@ jobs:
3239
3340
- name: Build CrateDB docker image
3441
run: |
35-
docker buildx build \
42+
docker build \
43+
--pull \
3644
--platform ${{ matrix.arch }} \
3745
--load \
3846
--file ./Dockerfile . \

.github/workflows/test.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN groupadd crate \
2727
&& gpg --batch --verify crate-6.2.0.tar.gz.asc crate-6.2.0.tar.gz \
2828
&& rm -rf "$GNUPGHOME" crate-6.2.0.tar.gz.asc \
2929
&& tar -xf crate-6.2.0.tar.gz -C /crate --strip-components=1 \
30-
&& file /crate/jdk/bin/java \
3130
&& rm crate-6.2.0.tar.gz
3231

3332
# Install crash
@@ -62,7 +61,7 @@ COPY --chown=1000:0 config/crate.yml /crate/config/crate.yml
6261
COPY --chown=1000:0 config/log4j2.properties /crate/config/log4j2.properties
6362

6463
LABEL maintainer="Crate.io <office@crate.io>" \
65-
org.opencontainers.image.created="2026-02-02T07:18:23.195789" \
64+
org.opencontainers.image.created="2026-01-14T10:02:40.676067" \
6665
org.opencontainers.image.title="crate" \
6766
org.opencontainers.image.description="CrateDB is a distributed SQL database that handles massive amounts of machine data in real-time." \
6867
org.opencontainers.image.url="https://crate.io/products/cratedb/" \

Dockerfile.j2

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
FROM almalinux:10-kitten
99

1010
# Install prerequisites and clean up repository indexes again
11-
RUN dnf install --nodocs --assumeyes gzip python3 shadow-utils tar util-linux gnupg \
11+
RUN dnf install --nodocs --assumeyes gzip python3 shadow-utils util-linux gnupg \
1212
&& dnf clean all \
1313
&& rm -rf /var/cache/yum
1414

15+
RUN tar --version
16+
RUN mount | column -t
17+
RUN mkdir -p /tmp/crate
18+
1519
# Install CrateDB
1620
RUN groupadd crate \
1721
&& useradd -u 1000 -g crate -d /crate crate \
@@ -21,13 +25,15 @@ RUN groupadd crate \
2125
aarch64) echo aarch64_linux ;; \
2226
esac)" \
2327
&& export CRATE_URL={{ CRATE_RELEASE_URL }}/${PLATFORM}/{{ CRATE_TAR_GZ }} \
24-
&& curl -fSL -O ${CRATE_URL} \
28+
&& echo $CRATE_URL \
29+
&& curl -v -fSL -O ${CRATE_URL} \
2530
&& curl -fSL -O ${CRATE_URL}.asc \
2631
&& export GNUPGHOME="$(mktemp -d)" \
2732
&& gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 90C23FC6585BC0717F8FBFC37FAAE51A06F6EAEB \
2833
&& gpg --batch --verify {{ CRATE_TAR_GZ }}.asc {{ CRATE_TAR_GZ }} \
2934
&& rm -rf "$GNUPGHOME" {{ CRATE_TAR_GZ }}.asc \
30-
&& tar -xf {{ CRATE_TAR_GZ }} -C /crate --strip-components=1 \
35+
&& echo $(sha256sum crate-6.2.0.tar.gz) \
36+
&& tar -xzvf crate-6.2.0.tar.gz -C /tmp/crate --strip-components=1 \
3137
&& rm {{ CRATE_TAR_GZ }}
3238

3339
# Install crash

0 commit comments

Comments
 (0)