Merge pull request #466 from salopensource/ghr_migration

This will work better

.github/workflows/build-latest.yml

@@ -1,15 +1,12 @@
 name: Build Latest
 
 on:
-  workflow_run:
-    workflows: ["Test"]
-    types:
-      - completed
+  release:
+    types: [published]
 
 jobs:
   build-latest:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main' }}
     steps:
     - uses: actions/checkout@v2
 
@@ -27,10 +24,3 @@ jobs:
         context: .
         push: true
         tags: ghcr.io/salopensource/sal:latest
-
-    - name: Generate artifact attestation
-      uses: actions/attest-build-provenance@v1
-      with:
-        subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-        subject-digest: ${{ steps.push.outputs.digest }}
-        push-to-registry: true

.github/workflows/build-tag.yml → .github/workflows/build-release.yml

@@ -1,15 +1,12 @@
 name: Build Tag
 
 on:
-  workflow_run:
-    workflows: ["Test"]
-    types:
-      - completed
+  release:
+    types: [published]
 
 jobs:
   build-tag:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_commit.message, 'tag:') }}
     steps:
     - uses: actions/checkout@v2
 
@@ -27,10 +24,4 @@ jobs:
         context: .
         push: true
         tags: ghcr.io/salopensource/sal:${{  github.ref_name }}
-
-    - name: Generate artifact attestation
-      uses: actions/attest-build-provenance@v1
-      with:
-        subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-        subject-digest: ${{ steps.push.outputs.digest }}
-        push-to-registry: true
+

.github/workflows/build-saml-latest.yml

@@ -1,15 +1,12 @@
 name: Build Latest SAML
 
 on:
-    workflow_run:
-      workflows: ["Test"]
-      types:
-        - completed
-
+    release:
+      types: [published]
+
 jobs:
   build-saml:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main' }}
     steps:
     - uses: actions/checkout@v2
 
@@ -34,10 +31,3 @@ jobs:
         file: saml/Dockerfile.pristine
         push: true
         tags: ghcr.io/salopensource/sal-saml:latest
-
-    - name: Generate artifact attestation
-      uses: actions/attest-build-provenance@v1
-      with:
-        subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-        subject-digest: ${{ steps.push.outputs.digest }}
-        push-to-registry: true

.github/workflows/build-saml-tag.yml → .github/workflows/build-saml-release.yml

@@ -1,15 +1,12 @@
 name: Build Tag
 
 on:
-    workflow_run:
-      workflows: ["Test"]
-      types:
-        - completed
+  release:
+    types: [published]
 
 jobs:
   build-saml-tag:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_commit.message, 'tag:') }}
     steps:
     - uses: actions/checkout@v2
 
@@ -34,10 +31,3 @@ jobs:
         push: true
         file: saml/Dockerfile.pristine
         tags: ghcr.io/salopensource/sal-saml:${{  github.ref_name }}
-
-    - name: Generate artifact attestation
-      uses: actions/attest-build-provenance@v1
-      with:
-        subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-        subject-digest: ${{ steps.push.outputs.digest }}
-        push-to-registry: true

README.md

@@ -32,11 +32,11 @@ After re-ordering and hiding plugins from some screens, you might even want to m
 
 ## External Authentication
 
-There are variants of Sal that support both [SAML](https://hub.docker.com/r/macadmins/sal-saml/) and [LDAP](https://hub.docker.com/r/macadmins/sal-ldap/) authentication.
+There is a variant of Sal that supports [SAML](https://github.com/salopensource/sal/pkgs/container/sal-saml)authentication.
 
 ## Having problems?
 
-You should check out the [troubleshooting](https://github.com/salopensource/sal/wiki/Troubleshooting) page, consider getting in touch via the [Google group](http://groups.google.com/group/sal-discuss), or heading over the the #sal channel on the [macadmins.org Slack](http://macadmins.org).
+You should check out the [troubleshooting](https://github.com/salopensource/sal/wiki/Troubleshooting) page, consider heading over the the #sal channel on the [macadmins.org Slack](http://macadmins.org).
 
 ## API
 

docker-compose.yaml

@@ -9,14 +9,14 @@ services:
       - /tmp/postgresql/db:/var/lib/postgresql/data
     restart: always
     environment:
-        DB_NAME: sal
-        DB_USER: admin
-        DB_PASS: password
+      DB_NAME: sal
+      DB_USER: admin
+      DB_PASS: password
 
   sal:
     depends_on:
       - db
-    image: macadmins/sal
+    image: ghcr.io/salopensource/sal
     ports:
       - "80:8000"
     restart: always
@@ -27,4 +27,3 @@ services:
       DB_PASS: password
 volumes:
   db_data: {}
-

docker/README.md

@@ -1,5 +1,3 @@
-# macadmins-sal
-
 This Docker image runs [Sal](https://github.com/salopensource/sal). The container expects a linked PostgreSQL database container.
 
 # Settings
@@ -51,7 +49,7 @@ $ docker run -d --name="postgres-sal" \
   grahamgilbert/postgres
 ```
 
-#Running the Sal Container
+# Running the Sal Container
 
 ```bash
 $ docker run -d --name="sal" \
@@ -62,7 +60,7 @@ $ docker run -d --name="sal" \
   -e DB_USER=admin \
   -e DB_PASS=password \
   --restart="always" \
-  macadmins/sal:2.0.1
+  ghcr.io/salopensource/sal:latest
 ```
 
 # Advanced usage
@@ -84,5 +82,5 @@ $ docker run -d --name="sal" \
   -e DB_USER=admin \
   -e DB_PASS=password \
   --restart="always" \
-  macadmins/sal:2.0.2
+  ghcr.io/salopensource/sal:latest
 ```

docker/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build -t "macadmins/sal" .
+docker build -t "ghcr.io/salopensource/sal" .

docker/docker_run.sh

@@ -11,4 +11,4 @@ docker run -d \
     --restart="always" \
     -v "$CWD/sal.db":/home/docker/sal/db/sal.db \
     -p 8000:8000 \
-    macadmins/sal
+   ghcr.io/salopensource/sal:latest

docker/docker_run_pg.sh

@@ -13,4 +13,4 @@ docker run -d \
     --link postgres-sal:db \
     --name=sal \
     -p 8000:8000 \
-    macadmins/sal
+    ghcr.io/salopensource/sal

sal/version.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>4.3.0.2294</string>
+	<string>4.3.0.2295</string>
 </dict>
 </plist>