Skip to content

Commit

Permalink
refactor: store & improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
ictorn committed May 23, 2024
1 parent f62a994 commit dc1b800
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 7 deletions.
25 changes: 22 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: "!contains(github.event.commits[0].message, 'skip:agma-server')"
timeout-minutes: 30
runs-on: ubuntu-latest
name: build base image for AGMA server
name: build server image
steps:
- uses: actions/checkout@v4
- uses: docker/login-action@v3
Expand All @@ -33,7 +33,7 @@ jobs:
if: "!contains(github.event.commits[0].message, 'skip:agma-vpn')"
timeout-minutes: 5
runs-on: ubuntu-latest
name: build image for openVPN
name: build vpn image
steps:
- uses: actions/checkout@v4
- uses: docker/login-action@v3
Expand All @@ -46,4 +46,23 @@ jobs:
with:
context: ./agma/vpn
push: true
tags: ghcr.io/${{ github.repository_owner }}/agma:vpn
tags: ghcr.io/${{ github.repository_owner }}/agma:vpn

agma-store:
if: "!contains(github.event.commits[0].message, 'skip:agma-store')"
timeout-minutes: 5
runs-on: ubuntu-latest
name: build store image
steps:
- uses: actions/checkout@v4
- uses: docker/login-action@v3
name: login to ghcr.io
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v5
with:
context: ./agma/store
push: true
tags: ghcr.io/${{ github.repository_owner }}/agma:store
1 change: 0 additions & 1 deletion agma/server/.dockerignore

This file was deleted.

4 changes: 2 additions & 2 deletions agma/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM dunglas/frankenphp:1.1.5-php8.3.7-alpine
FROM dunglas/frankenphp:1.1.5-php8.3.7

RUN set -xe \
&& install-php-extensions opcache sockets pcntl pdo_pgsql pdo_sqlsrv gd decimal bcmath intl zip soap \
&& install-php-extensions opcache pdo_pgsql pdo_sqlsrv gd decimal bcmath intl zip soap \
&& setcap -r /usr/local/bin/frankenphp

COPY config/php.ini /usr/local/etc/php/php.ini
Expand Down
6 changes: 6 additions & 0 deletions agma/store/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM registry.redict.io/redict:7.3.0-scratch

COPY ./config/ /config

ENTRYPOINT ["/bin/redict-server"]
CMD ["/config/server.conf"]
4 changes: 4 additions & 0 deletions agma/store/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
set -e

docker build --no-cache --pull --platform "linux/arm64" -t rckik/app:store .
7 changes: 7 additions & 0 deletions agma/store/config/server.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
bind 127.0.0.1
databases 2
set-proc-title no
save ""
maxmemory 50MB
maxmemory-policy volatile-lru
aclfile /config/users.acl
1 change: 1 addition & 0 deletions agma/store/config/users.acl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
user default on nopass sanitize-payload ~* &* +@all
1 change: 0 additions & 1 deletion agma/vpn/.dockerignore

This file was deleted.

0 comments on commit dc1b800

Please sign in to comment.