Skip to content

fixing docker compose #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
temuenz merged 7 commits into from
Dec 31, 2025
Merged

fixing docker compose #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ec5def
fixing docker compose
temuenz Dec 31, 2025
dd5c31f
adjust docker-compose.yml
temuenz Dec 31, 2025
2429ecc
add the signing step to the process
temuenz Dec 31, 2025
d3abed9
adding sign rpm to the process
temuenz Dec 31, 2025
addc4bc
fix signer step
temuenz Dec 31, 2025
8cec52d
check sign script
temuenz Dec 31, 2025
ff8cd4a
fix the sign script
temuenz Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/ci-run-on-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
#- 14
#- 15
#- 16
- 17
#- 18
#- 17
- 18
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -47,6 +47,13 @@ jobs:
env:
PGVERSION: ${{ matrix.pgversion }}

- name: Run rpm signer
env:
PGVERSION: ${{ matrix.pgversion }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_KEY_B64: ${{ secrets.GPG_KEY_B64 }}
run: docker-compose up rpmsigner --exit-code-from rpmsigner

- name: copy rpm to postgres context
run: |
cp -av rpms docker/postgres/
Expand Down
10 changes: 4 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,20 @@ services:
platform: linux/amd64
volumes:
- ./:/host
command: >
- /scripts/build_rpm.sh
command: /scripts/build_rpm.sh
postgres:
build:
context: docker/postgres
environment:
LD_LIBRARY_PATH: /opt/ibm/db2/V12.1/lib64
rpmsigner:
image: builder
command:
- /host/scripts/sign_rpms.sh
command: /scripts/sign_rpms.sh
volumes:
- ./:/host
environment:
- GPG_PASSPHRASE
- GPG_KEY_B64
GPG_PASSPHRASE: ${GPG_PASSPHRASE}
GPG_KEY_B64: ${GPG_KEY_B64}
#dev:
# image: builder
# platform: linux/amd64
Expand Down
2 changes: 1 addition & 1 deletion docker/builder/scripts/sign_rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DEST=${DEST:-/host}
cd "$DEST"
export GPG_TTY=$(tty)

sed "s/PASSPHRASE/${GPG_PASSPHRASE}/" config/signmacros >~/.rpmmacros
sed "s/GPG_PASSPHRASE/${GPG_PASSPHRASE}/" config/signmacros >~/.rpmmacros
gpg --import --no-tty --batch --yes <RPM-GPG-KEY-myrepo
echo "Importing seckey..."
echo "${GPG_KEY_B64}" | base64 -d | gpg --import --no-tty --batch --yes
Expand Down