Skip to content

Commit

Permalink
Merge pull request #45 from hathitrust/authproxyshib
Browse files Browse the repository at this point in the history
authproxyshib
  • Loading branch information
aelkiss authored May 21, 2021
2 parents a1adf86 + 17e15e6 commit 4f0ae60
Show file tree
Hide file tree
Showing 9 changed files with 222 additions and 167 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Docker Build master

on:
push:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- 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: Clone latest repository
uses: actions/checkout@v2
- name: Build dex container image and push to DockerHub
uses: docker/build-push-action@v2
with:
push: true
tags: 'hathitrust/dex-shib-proxy-unstable:${{ github.sha }},hathitrust/dex-shib-proxy-unstable:latest'
file: Dockerfile
10 changes: 4 additions & 6 deletions .github/workflows/ci.yaml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,17 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v1
with:
go-version: 1.16

- name: Checkout code
uses: actions/checkout@v2

- name: Start services
run: docker-compose -f docker-compose.test.yaml up -d

- name: Test
- name: Run tests
run: make testall
env:
DEX_FOO_USER_PASSWORD: $2a$10$33EMT0cVYVlPy6WAMCLsceLYjWhuHpbz5yuZxu/GAFj03J9Lytjuy
DEX_MYSQL_DATABASE: dex
DEX_MYSQL_USER: root
DEX_MYSQL_PASSWORD: root
Expand All @@ -79,7 +77,7 @@ jobs:
DEX_KEYSTONE_ADMIN_USER: demo
DEX_KEYSTONE_ADMIN_PASS: DEMO_PASS

- name: Lint
- name: Run linter
run: make lint

# Ensure proto generation doesn't depend on external packages.
Expand Down
67 changes: 0 additions & 67 deletions .github/workflows/codeql-analysis.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/deploy-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Manual Deploy (Testing)

on:
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: azure/setup-kubectl@v1
- name: Authenticate with kubernetes
run: |
mkdir -p ${HOME}/.kube/certs/cluster
echo ${{ secrets.KUBERNETES_CA }} | base64 -d > ${HOME}/.kube/certs/cluster/k8s-ca.crt
kubectl config set-cluster cluster --certificate-authority=${HOME}/.kube/certs/cluster/k8s-ca.crt --server=https://macc.kubernetes.hathitrust.org
kubectl config set-credentials github --token=${{ secrets.KUBERNETES_TOKEN }}
kubectl config set-context github --cluster=cluster --user=github --namespace=oidc-saml-proxy-testing
kubectl config use-context github
- name: Manual Deploy (Testing)
run: kubectl set image deployment oidc-saml-proxy oidc-saml-proxy=hathitrust/dex-shib-proxy-unstable:latest
20 changes: 20 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Manual Deploy (Production)

on:
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: azure/setup-kubectl@v1
- name: Authenticate with kubernetes
run: |
mkdir -p ${HOME}/.kube/certs/cluster
echo ${{ secrets.KUBERNETES_CA }} | base64 -d > ${HOME}/.kube/certs/cluster/k8s-ca.crt
kubectl config set-cluster cluster --certificate-authority=${HOME}/.kube/certs/cluster/k8s-ca.crt --server=https://macc.kubernetes.hathitrust.org
kubectl config set-credentials github --token=${{ secrets.KUBERNETES_TOKEN }}
kubectl config set-context github --cluster=cluster --user=github --namespace=oidc-saml-proxy-production
kubectl config use-context github
- name: Manual Deploy (Production)
run: kubectl set image deployment oidc-saml-proxy oidc-saml-proxy=hathitrust/dex-shib-proxy:latest
94 changes: 0 additions & 94 deletions .github/workflows/docker.yaml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Docker Tag Latest Release

on:
release:
types: [ released ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- 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: Clone latest repository
uses: actions/checkout@v2
- name: Tag latest release in DockerHub
run: |
docker pull hathitrust/dex-shib-proxy-unstable:${{ github.sha }}
docker tag hathitrust/dex-shib-proxy-unstable:${{ github.sha }} hathitrust/dex-shib-proxy:${{ github.event.release.tag_name }}
docker tag hathitrust/dex-shib-proxy-unstable:${{ github.sha }} hathitrust/dex-shib-proxy:latest
docker push hathitrust/dex-shib-proxy:${{ github.event.release.tag_name }}
docker push hathitrust/dex-shib-proxy:latest
Loading

0 comments on commit 4f0ae60

Please sign in to comment.