From 2aff0ff68aa7593cfa317f4980593f2b39127a37 Mon Sep 17 00:00:00 2001 From: Gibby Date: Sat, 16 Apr 2022 16:31:17 -0400 Subject: fix: Updated recipe submodule and workflow to build/publish docker image --- .github/dependabot.yml | 7 +++++ .github/workflows/builds.yml | 64 -------------------------------------------- .github/workflows/docker.yml | 51 +++++++++++++++++++++++++++++++++++ .gitmodules | 4 ++- Dockerfile | 2 +- 5 files changed, 62 insertions(+), 66 deletions(-) create mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/builds.yml create mode 100644 .github/workflows/docker.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2c7d170 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml deleted file mode 100644 index 68f60ea..0000000 --- a/.github/workflows/builds.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Builds - -on: - push: - tags: - - 'v*.*.*' - release: - types: [published] - workflow_dispatch: - -jobs: - image-build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - images: | - getferdi/ferdi-server - # ghcr.io/getferdi/ferdi-server - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - labels: org.opencontainers.image.title=Ferdi-server - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: FerdiBot - password: ${{ secrets.GH_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }}, getferdi/ferdi-server:latest - labels: ${{ steps.meta.outputs.labels }} - - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..bc9b3f4 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,51 @@ +name: Docker Build and Publish + +on: + push: + branches: + - 'master' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + ghcr.io/${{ github.repository }} + # generate Docker tags based on the following events/attributes + tags: | + type=ref,event=branch + type=semver,pattern={{version}} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + # Due to build time, only building the one currently needed. + # If needed, we can add more platforms when requested. + platforms: "linux/amd64" + # Push pull requests so they can be tested + #push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.gitmodules b/.gitmodules index 5a8d15f..78bbdda 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,5 @@ [submodule "recipes"] path = recipes - url = https://github.com/getferdi/recipes + url = https://github.com/ferdium/ferdium-recipes.git + ignore = all + branch = main diff --git a/Dockerfile b/Dockerfile index 57e3044..7e7750c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN ["npm", "ci", "--production", "--build-from-source", "--sqlite=/usr/local"] FROM node:14.17-alpine WORKDIR /app -LABEL maintainer="xthursdayx" +LABEL maintainer="ferdium" ENV HOST=0.0.0.0 PORT=3333 DATA_DIR="/data" -- cgit v1.2.3-54-g00ecf From b1879af6dd255f6ff09b2a409cf3daeccc3d90e6 Mon Sep 17 00:00:00 2001 From: Gibby Date: Sat, 16 Apr 2022 16:37:41 -0400 Subject: docs: Update to point to correct docker image --- README.md | 4 ++-- docker/README.md | 8 ++++---- docker/docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 773bf91..da67952 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ After setting up the docker container we recommend you set up an NGINX reverse p 1. Pull the Docker image ```sh - docker pull getferdi/ferdi-server + docker pull ghcr.io/ferdium/ferdium-server ``` 2. Create a *new* Docker container with your desired configuration **Existing users please seee the warning above.** @@ -80,7 +80,7 @@ After setting up the docker container we recommend you set up an NGINX reverse p -v :/data \ -v :/app/recipes \ --restart unless-stopped \ - getferdi/ferdi-server + ghcr.io/ferdium/ferdium-server ``` Alternatively, you can also use docker-compose v2 schema. An example can be found [in the docker folder](./docker/docker-compose.yml). diff --git a/docker/README.md b/docker/README.md index 3cb49be..fa36da9 100644 --- a/docker/README.md +++ b/docker/README.md @@ -28,7 +28,7 @@ The docker can be run as is, with the default sqlite database, or you can modify Pull the docker image: - docker pull getferdi/ferdi-server + docker pull ghcr.io/ferdium/ferdium-server To create the docker container with the proper parameters: @@ -59,7 +59,7 @@ To create the docker container with the proper parameters: -v :/data \ -v :/app/recipes \ --restart unless-stopped \ - getferdi/ferdi-server + ghcr.io/ferdium/ferdium-server ### docker-compose @@ -212,7 +212,7 @@ Below are the instructions for updating the container to get the most recent ver ### Via Docker Run/Create -* Update the image: `docker pull getferdi/ferdi-server` +* Update the image: `docker pull ghcr.io/ferdium/ferdium-server` * Stop the running container: `docker stop ferdi-server` * Delete the container: `docker rm ferdi-server` * Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and ENV settings will be preserved) @@ -232,7 +232,7 @@ If you want to build this image locally, please run this command from root of [F docker build \ --no-cache \ --pull \ - -t getferdi/ferdi-server:latest . + -t ghcr.io/ferdium/ferdium-server:latest . ``` ## License diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4902331..5a46cda 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: "2" services: ferdi-server: - image: getferdi/ferdi-server + image: ghcr.io/ferdium/ferdium-server container_name: ferdi-server environment: - NODE_ENV=development -- cgit v1.2.3-54-g00ecf