Merge branch 'master' into 46-add-arm64-support

.github/workflows/ci.yml

@@ -3,9 +3,9 @@ name: CI
 on:
   push:
     branches:
-      - '*'
+      - "*"
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   test:
@@ -58,19 +58,17 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@master
-      #   with:
-      #     platforms: all
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@master
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -84,7 +82,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: maxhollmann/podify
+          images: blakek13/podify
           tags: |
             type=ref,event=branch
             type=semver,pattern=v{{version}},event=tag
@@ -100,7 +98,7 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64 # ,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.1-bullseye
+FROM docker.io/library/ruby:3.2.1
 
 # Note: This is deprecated
 RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - 

README.md

@@ -1,7 +1,7 @@
 # Podify
 
-![Docker Image Version (latest semver)](https://img.shields.io/docker/v/maxhollmann/podify?sort=semver)
-![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/maxhollmann/podify?sort=semver)
+![Docker Image Version (latest semver)](https://img.shields.io/docker/v/blakek13/podify?sort=semver)
+![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/blakek13/podify?sort=semver)
 ![GitHub](https://img.shields.io/github/license/podify-org/podify)
 ![CI](https://github.com/podify-org/podify/workflows/CI/badge.svg)
 
@@ -17,22 +17,22 @@ Here's a [sample `docker-compose.yml`](docker/docker-compose.example.yml).
 
 ## Configuration via Environment Variables
 
-| Variable              | Required | Description                                                                                           |
-|:----------------------|:---------|:------------------------------------------------------------------------------------------------------|
-| DATABASE_URL          | Yes      | `postgres://` url pointing to postgres database                                                       |
-| REDIS_URL             | Yes      | `redis://` url pointing to redis instance                                                             |
-| URL_HOST              | Yes      | Where the app will be available, e.g. `https://podify.yourdomain.com`                                 |
-| SECRET_KEY_BASE       | Yes      | This is used to encrypt sessions, see [below](#secret_key_base)                                       |
-| STORAGE_DIR           | Yes      | Where downloads will be stored                                                                        |
-| INITIAL_USER_EMAIL    | No       | Email of user to create at startup                                                                    |
-| INITIAL_USER_PASSWORD | No       | Password of user to create at startup                                                                 |
-| ENABLE_SIGNUP         | No       | Allow anyone with access to the site to sign up. `"yes"` or `"no"` (default: `"yes"`)                 |
+| Variable              | Required | Description                                                                           |
+| :-------------------- | :------- | :------------------------------------------------------------------------------------ |
+| DATABASE_URL          | Yes      | `postgres://` url pointing to postgres database                                       |
+| REDIS_URL             | Yes      | `redis://` url pointing to redis instance                                             |
+| URL_HOST              | Yes      | Where the app will be available, e.g. `https://podify.yourdomain.com`                 |
+| SECRET_KEY_BASE       | Yes      | This is used to encrypt sessions, see [below](#secret_key_base)                       |
+| STORAGE_DIR           | Yes      | Where downloads will be stored                                                        |
+| INITIAL_USER_EMAIL    | No       | Email of user to create at startup                                                    |
+| INITIAL_USER_PASSWORD | No       | Password of user to create at startup                                                 |
+| ENABLE_SIGNUP         | No       | Allow anyone with access to the site to sign up. `"yes"` or `"no"` (default: `"yes"`) |
 
 ### `SECRET_KEY_BASE`
 
 This is utilized to encrypt and sign sessions. It's recommended that you generate a new one instead of using the one from the example `docker-compose.yml`. You can generate a new one using
 
-    docker run --rm maxhollmann/podify rails secret
+    docker run --rm blakek13/podify rails secret
 
 ## Development
 

docker/docker-compose.build.yml

@@ -1,7 +1,7 @@
-version: '3.1'
+version: "3.1"
 
 services:
   podify:
-    image: maxhollmann/podify:dev
+    image: blakek13/podify:dev
     build:
       context: ..

docker/docker-compose.example.yml

@@ -1,4 +1,4 @@
-version: '3.4'
+version: "3.4"
 
 x-app-defaults: &app-defaults
   restart: always
@@ -22,7 +22,7 @@ x-app-defaults: &app-defaults
 services:
   web:
     <<: *app-defaults
-    image: maxhollmann/podify:latest
+    image: blakek13/podify:latest
     command: start-server
     ports:
       - 3000:3000
@@ -31,7 +31,7 @@ services:
 
   worker:
     <<: *app-defaults
-    image: maxhollmann/podify:latest
+    image: blakek13/podify:latest
     command: start-worker
     environment:
       <<: *app-env

docker/push

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-if [[ "$1" = "-h" ]]; then
-    echo "Usage: docker-push [tag]"
-    echo
-    echo "  tag defaults to 'dev'"
-    exit 1
+if [[ $1 == "-h" ]]; then
+	echo "Usage: docker-push [tag]"
+	echo
+	echo "  tag defaults to 'dev'"
+	exit 1
 fi
 
 tag=${1:-dev}
 
-image=maxhollmann/podify
+image=blakek13/podify
 
 echo "Tagging $image:dev as $image:$tag"
 docker tag $image:dev $image:$tag