diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index afecd71..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/cops - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" diff --git a/Containerfile b/Containerfile new file mode 100644 index 0000000..8cc1bac --- /dev/null +++ b/Containerfile @@ -0,0 +1,43 @@ +FROM docker.io/thallian/php8-fpm:3.19-8.3 + +ENV FPMUSER nginx +ENV FPMGROUP nginx + +ENV VERSION 2.2.1 + +RUN apk add --no-cache \ + openssl \ + git \ + nginx \ + wget \ + php83 \ + php83-opcache \ + php83-pcntl \ + php83-gd \ + php83-sqlite3 \ + php83-json \ + php83-intl \ + php83-xml \ + php83-mbstring \ + php83-zip \ + php83-openssl \ + php83-phar \ + php83-pdo_sqlite \ + php83-ctype \ + php83-xmlwriter \ + php83-dom + +RUN mkdir -p /usr/share/webapps/cops +RUN wget -qO- https://github.com/mikespub-org/seblucas-cops/archive/$VERSION.tar.gz | tar xz -C /usr/share/webapps/cops --strip 1 + +WORKDIR /usr/share/webapps/cops +ENV COMPOSER_HASH=72600201c73c7c4b218f1c0511b36d8537963e36aafa244757f52309f885b314 +RUN wget https://getcomposer.org/download/2.6.6/composer.phar +RUN echo "$COMPOSER_HASH composer.phar" | sha256sum -c - || exit 1 +RUN php83 composer.phar install --no-dev --optimize-autoloader + +RUN chown -R nginx:nginx /usr/share/webapps/cops + +ADD /rootfs / + +VOLUME /var/lib/cops/calibre diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 182cadb..0000000 --- a/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM thallian/php7-fpm:latest - -ENV FPMUSER nginx -ENV FPMGROUP nginx - -ENV VERSION f65537cdc6f11e135fdc0fbfcaf05524f63ec667 - -RUN apk add --no-cache \ - openssl \ - git \ - nginx \ - wget \ - php7 \ - php7-opcache \ - php7-pcntl \ - php7-gd \ - php7-sqlite3 \ - php7-json \ - php7-intl \ - php7-xml \ - php7-mbstring \ - php7-zip \ - php7-openssl \ - php7-phar \ - php7-pdo_sqlite \ - php7-ctype \ - php7-xmlwriter \ - php7-dom - -RUN mkdir -p /usr/share/webapps/cops -RUN wget -qO- https://github.com/seblucas/cops/archive/$VERSION.tar.gz | tar xz -C /usr/share/webapps/cops --strip 1 - -WORKDIR /usr/share/webapps/cops -RUN wget https://getcomposer.org/download/1.9.0/composer.phar -RUN php composer.phar --no-plugins global require "fxp/composer-asset-plugin:~1.1" -RUN php composer.phar install --no-dev --optimize-autoloader - -RUN chown -R nginx:nginx /usr/share/webapps/cops - -RUN rm /etc/nginx/http.d/default.conf - -ADD /rootfs / - -VOLUME /var/lib/cops/calibre diff --git a/README.md b/README.md index 7d04447..97ab901 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[COPS](https://github.com/seblucas/cops), a web-based light alternative to Calibre content server. +[COPS](https://github.com/mikespub-org/seblucas-cops), a web-based light alternative to Calibre content server. # Volumes - `/var/lib/cops/calibre` diff --git a/rootfs/etc/confd/templates/cops.conf.tmpl b/rootfs/etc/confd/templates/cops.conf.tmpl index 7f65555..e0997ef 100644 --- a/rootfs/etc/confd/templates/cops.conf.tmpl +++ b/rootfs/etc/confd/templates/cops.conf.tmpl @@ -6,6 +6,7 @@ upstream php { } server { + listen [::]:8080; listen 8080; server_name {{getenv "DOMAIN"}};