Skip to content

Commit 2d027fa

Browse files
authored
Merge pull request #2 from valitydev/ft/bump-binbase
Bumps valitydev/binbase@633c44f
2 parents 000c596 + 3889125 commit 2d027fa

File tree

6 files changed

+31
-49
lines changed

6 files changed

+31
-49
lines changed

.github/workflows/deploy.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Deploy Docker Image
2+
3+
on:
4+
push:
5+
branches:
6+
- "master"
7+
- "main"
8+
- "epic/*"
9+
10+
env:
11+
REGISTRY: ghcr.io
12+
IMAGE_NAME: ${{ github.repository }}
13+
14+
jobs:
15+
deploy:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Deploy image
20+
uses: valitydev/action-deploy-docker@v2
21+
with:
22+
registry-username: ${{ github.actor }}
23+
registry-access-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
FROM dr2.rbkmoney.com/rbkmoney/binbase:05910a0cf3634ad3d8826b7b70d3a8b70444c2f4 as build
2-
3-
MAINTAINER Pavel Popov <p.popov@rbkmoney.com>
1+
FROM --platform=$BUILDPLATFORM ghcr.io/valitydev/binbase:sha-633c44f as build
42

3+
USER root
54
RUN apt update \
65
&& apt install -y \
76
postgresql \
8-
unzip \
97
&& rm -rf /var/lib/apt/lists/*
108

119
COPY data /opt/binbase-test-data/data
12-
RUN unzip /opt/binbase-test-data/data/\*.zip -d /opt/binbase-test-data/data/unzip
1310

1411
USER postgres
1512
RUN service postgresql start \
1613
&& psql --command "CREATE DATABASE binbase;" \
1714
&& psql --command "ALTER USER postgres WITH SUPERUSER PASSWORD 'postgres';" \
18-
&& java -jar /opt/binbase/binbase.jar com.rbkmoney.binbase.config.BatchConfig binBaseJob --logging.level.com.rbkmoney.binbase=ERROR --logging.level.com.rbkmoney.binbase.batch.listener.DefaultChunkListener=INFO --batch.file_path=file:/opt/binbase-test-data/data/unzip --batch.shutdown_after_execute=true \
15+
&& java -jar /opt/binbase/binbase.jar dev.vality.binbase.config.BatchConfig binBaseJob --logging.level.dev.vality.binbase=ERROR --logging.level.dev.vality.binbase.batch.listener.DefaultChunkListener=INFO --batch.file_path=file:/opt/binbase-test-data/data --batch.shutdown_after_execute=true --server.port=0 --batch.strict_mode=false \
1916
&& psql --command "SELECT pg_size_pretty(pg_database_size('binbase'));" \
2017
&& psql --command "VACUUM FULL;" \
2118
&& psql --command "SELECT pg_size_pretty(pg_database_size('binbase'));" \
2219
&& service postgresql stop
2320

24-
FROM dr2.rbkmoney.com/rbkmoney/binbase:05910a0cf3634ad3d8826b7b70d3a8b70444c2f4
21+
FROM ghcr.io/valitydev/binbase:sha-633c44f
2522

2623
COPY entrypoint.sh /opt/binbase-test-data/entrypoint.sh
2724

25+
USER root
2826
RUN apt update \
2927
&& apt install -y \
3028
postgresql \
@@ -38,6 +36,6 @@ COPY --chown=postgres:postgres --from=build /etc/postgresql/ /etc/postgresql/
3836

3937
WORKDIR /opt/binbase-test-data
4038
ENTRYPOINT ["/opt/binbase-test-data/entrypoint.sh"]
41-
CMD ["java", "-Xmx256m", "-jar","/opt/binbase/binbase.jar", "--spring.batch.job.enabled=false"]
39+
CMD ["java", "-Xmx256m", "-jar","/opt/binbase/binbase.jar", "--spring.batch.job.enabled=false --batch.strict_mode=false"]
4240

4341
EXPOSE 8022

Jenkinsfile

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

data/20200929_bins_iso.zip

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

data/20250919__bins_iso_test.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
400000;VISA;;DEBIT;;;;;

entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ trap onExit EXIT
66

77
service postgresql start
88
$@
9-
exit $?
9+
exit $?

0 commit comments

Comments
 (0)