Skip to content

Commit 78eedd7

Browse files
committed
Merge branch 'master' into epic/registration_bump
2 parents c908574 + cdb4c00 commit 78eedd7

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

.env

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
OTP_VERSION=24.3.4
1+
OTP_VERSION=27.1.2
22
STEP_VERSION=0.24.3
3-
THRIFT_VERSION=0.14.2.2
4-
WOORL_VERSION=1.10
3+
REBAR_VERSION=3.24
4+
THRIFT_VERSION=0.14.2.3
5+
WOORL_VERSION=1.11

.github/workflows/build-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Log in to the Container registry
2121
uses: docker/login-action@v3
@@ -42,7 +42,7 @@ jobs:
4242
uses: docker/setup-buildx-action@v3
4343

4444
- name: Build and push Docker image
45-
uses: docker/build-push-action@v5
45+
uses: docker/build-push-action@v6
4646
with:
4747
context: .
4848
push: ${{ github.event_name == 'push' }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828

2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@v3

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ RUN apt-get --yes update \
2424
netcat-openbsd \
2525
jq \
2626
python3-pip \
27+
python3-six \
2728
wget \
2829
gnupg \
29-
&& pip install --no-cache-dir six \
3030
&& wget -O - -q https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null \
31-
&& echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
31+
&& echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
3232
&& apt-get --yes update \
3333
&& apt-get --yes --no-install-recommends install postgresql-client-17 \
3434
&& apt-get clean \

0 commit comments

Comments
 (0)