GitHub-Bitwarden
/
self-host
mirror of https://github.com/bitwarden/self-host.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update workflows (#71)

pull/76/head v2022.12.0
Vince Grassia 3 years ago committed by GitHub
parent
93e6f88e54
commit
ddcd62c1fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 78 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      .github/workflows/build-self-host.yml
  2. 25
      .github/workflows/release-digital-ocean.yml
  3. 144
      .github/workflows/release.yml
  4. 5
      DigitalOceanMarketplace/marketplace-image.json
  5. 2
      DigitalOceanMarketplace/scripts/99-img-check.sh

19
.github/workflows/build-self-host.yml
Unescape View File

@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
---
name: Build Self-Host
on:
push:
branches-ignore:
- "l10n_master"
- "gh-pages"
paths-ignore:
- ".github/workflows/**"
workflow_dispatch:
jobs:
stub:
name: Stub
runs-on: ubuntu-22.04
steps:
- name: Success
run: exit 0

25
.github/workflows/release-digital-ocean.yml
Unescape View File

@ -10,12 +10,11 @@ on: @@ -10,12 +10,11 @@ on:
- "DigitalOceanMarketplace/**"
workflow_dispatch:
inputs: {}
jobs:
build-image:
name: Build Image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
@ -27,17 +26,10 @@ jobs: @@ -27,17 +26,10 @@ jobs:
- name: Retrieve secrets
id: retrieve-secrets
env:
KEYVAULT: bitwarden-prod-kv
SECRETS: |
digital-ocean-api-key
run: |
for i in ${SECRETS//,/ }
do
VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
echo "::add-mask::$VALUE"
echo "$i=$VALUE" >> $GITHUB_OUTPUT
done
uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
with:
keyvault: "bitwarden-prod-kv"
secrets: "digital-ocean-api-key"
- name: Set version from version.json
id: set-version
@ -52,11 +44,12 @@ jobs: @@ -52,11 +44,12 @@ jobs:
DIGITALOCEAN_TOKEN: ${{ steps.retrieve-secrets.outputs.digital-ocean-api-key }}
DIGITALOCEAN_IMG_VERSION: ${{ steps.set-version.outputs.version }}
working-directory: ./DigitalOceanMarketplace
run: packer build marketplace-image.json
run: |
packer version
packer build marketplace-image.json
- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master
uses: Homebrew/actions/setup-homebrew@659165717b1fd1b535840baa14e399a305d20561
- name: Digital Ocean Image Cleanup
env:

144
.github/workflows/release.yml
Unescape View File

@ -11,9 +11,7 @@ on: @@ -11,9 +11,7 @@ on:
jobs:
setup:
name: Setup
runs-on: ubuntu-20.04
outputs:
branch-name: ${{ steps.branch.outputs.branch-name }}
runs-on: ubuntu-22.04
steps:
- name: Branch check
run: |
@ -43,22 +41,16 @@ jobs: @@ -43,22 +41,16 @@ jobs:
exit 1
fi
- name: Get branch name
id: branch
run: |
BRANCH_NAME=$(basename ${{ github.ref }})
echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
release:
name: Create GitHub Release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: setup
steps:
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: ${{ needs.setup.outputs.branch-name }}
ref: master
- name: Create release
uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
@ -77,15 +69,15 @@ jobs: @@ -77,15 +69,15 @@ jobs:
release-version:
name: Upload version.json
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- setup
- release
- setup
- release
steps:
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: ${{ needs.setup.outputs.branch-name }}
ref: master
- name: Login to Azure
uses: Azure/login@ec3c14589bd3e9312b3cc8c41e6860e258df9010
@ -94,22 +86,15 @@ jobs: @@ -94,22 +86,15 @@ jobs:
- name: Retrieve secrets
id: retrieve-secrets
env:
KEYVAULT: bitwarden-prod-kv
SECRETS: |
aws-selfhost-version-access-id,
uses: bitwarden/gh-actions/get-keyvault-secrets@c3b3285993151c5af47cefcb3b9134c28ab479af
with:
keyvault: "bitwarden-prod-kv"
secrets: "aws-selfhost-version-access-id,
aws-selfhost-version-access-key,
r2-electron-access-id,
r2-electron-access-key,
r2-bitwarden-selfhost-version-bucket-name,
cf-prod-account
run: |
for i in ${SECRETS//,/ }
do
VALUE=$(az keyvault secret show --vault-name $KEYVAULT --name $i --query value --output tsv)
echo "::add-mask::$VALUE"
echo "$i=$VALUE" >> $GITHUB_OUTPUT
done
cf-prod-account"
- name: Upload version.json to S3 bucket
env:
@ -135,33 +120,32 @@ jobs: @@ -135,33 +120,32 @@ jobs:
--endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com
tag-docker-latest:
name: Tag Docker image latest
runs-on: ubuntu-20.04
name: Tag Docker images latest
runs-on: ubuntu-22.04
needs:
- setup
- release
env:
_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
_BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
_BRANCH_NAME: master
strategy:
fail-fast: false
matrix:
include:
- service_name: Admin
- service_name: Api
- service_name: Attachments
- service_name: Events
- service_name: Icons
- service_name: Identity
- service_name: K8S-Proxy
- service_name: MsSql
- service_name: Nginx
- service_name: Notifications
- service_name: Server
- service_name: Setup
- service_name: Sso
- service_name: Web
- service_name: Scim
- project_name: Admin
- project_name: Api
- project_name: Attachments
- project_name: Events
- project_name: Icons
- project_name: Identity
- project_name: MsSql
- project_name: Nginx
- project_name: Notifications
- project_name: Server
- project_name: Setup
- project_name: Sso
- project_name: Web
- project_name: Scim
steps:
- name: Print environment
run: |
@ -173,15 +157,15 @@ jobs: @@ -173,15 +157,15 @@ jobs:
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: ${{ needs.setup.outputs.branch-name }}
ref: master
- name: Setup service name
- name: Setup project name
id: setup
run: |
SERVICE_NAME=$(echo "${{ matrix.service_name }}" | awk '{print tolower($0)}')
echo "Matrix name: ${{ matrix.service_name }}"
echo "SERVICE_NAME: $SERVICE_NAME"
echo "service_name=$SERVICE_NAME" >> $GITHUB_OUTPUT
PROJECT_NAME=$(echo "${{ matrix.project_name }}" | awk '{print tolower($0)}')
echo "Matrix name: ${{ matrix.project_name }}"
echo "PROJECT_NAME: $PROJECT_NAME"
echo "project_name=$PROJECT_NAME" >> $GITHUB_OUTPUT
########## DockerHub ##########
- name: Setup DCT
@ -193,24 +177,24 @@ jobs: @@ -193,24 +177,24 @@ jobs:
- name: Pull versioned image
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
run: docker pull bitwarden/$SERVICE_NAME:$_RELEASE_VERSION
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
run: docker pull bitwarden/$PROJECT_NAME:$_RELEASE_VERSION
- name: Tag latest
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
run: docker tag bitwarden/$SERVICE_NAME:$_RELEASE_VERSION bitwarden/$SERVICE_NAME:latest
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
run: docker tag bitwarden/$PROJECT_NAME:$_RELEASE_VERSION bitwarden/$PROJECT_NAME:latest
- name: Push latest image
env:
DOCKER_CONTENT_TRUST: 1
DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
run: |
if [ "$SERVICE_NAME" == "scim" ]; then
if [ "$PROJECT_NAME" == "scim" ]; then
export DOCKER_CONTENT_TRUST=0
fi
docker push bitwarden/$SERVICE_NAME:latest
docker push bitwarden/$PROJECT_NAME:latest
- name: Log out of Docker and disable Docker Notary
run: |
@ -228,22 +212,22 @@ jobs: @@ -228,22 +212,22 @@ jobs:
- name: Tag latest
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
REGISTRY: bitwardenqa.azurecr.io
run: docker tag bitwarden/$SERVICE_NAME:$_RELEASE_VERSION $REGISTRY/$SERVICE_NAME:latest
run: docker tag bitwarden/$PROJECT_NAME:$_RELEASE_VERSION $REGISTRY/$PROJECT_NAME:latest
- name: Push version and latest image
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
REGISTRY: bitwardenqa.azurecr.io
run: docker push $REGISTRY/$SERVICE_NAME:latest
run: docker push $REGISTRY/$PROJECT_NAME:latest
- name: Log out of Docker
run: docker logout
tag-docker-bitwardenqa-latest:
name: Tag Docker images from bitwardenqa latest
runs-on: ubuntu-20.04
tag-docker-web-latest:
name: Tag Web Docker images from bitwardenqa latest
runs-on: ubuntu-22.04
needs:
- setup
- release
@ -251,11 +235,11 @@ jobs: @@ -251,11 +235,11 @@ jobs:
fail-fast: false
matrix:
include:
- service_name: web-sh
- service_name: web-ee
- project_name: web-sh
# - project_name: web-ee # Needs to be fixed in Web client release workflow.
env:
_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
_BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
_BRANCH_NAME: master
steps:
- name: Print environment
run: |
@ -267,15 +251,15 @@ jobs: @@ -267,15 +251,15 @@ jobs:
- name: Checkout repo
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: ${{ needs.setup.outputs.branch-name }}
ref: master
- name: Setup service name
- name: Setup project name
id: setup
run: |
SERVICE_NAME=$(echo "${{ matrix.service_name }}" | awk '{print tolower($0)}')
echo "Matrix name: ${{ matrix.service_name }}"
echo "SERVICE_NAME: $SERVICE_NAME"
echo "service_name=$SERVICE_NAME" >> $GITHUB_OUTPUT
PROJECT_NAME=$(echo "${{ matrix.project_name }}" | awk '{print tolower($0)}')
echo "Matrix name: ${{ matrix.project_name }}"
echo "PROJECT_NAME: $PROJECT_NAME"
echo "project_name=$PROJECT_NAME" >> $GITHUB_OUTPUT
########## ACR ##########
- name: Login to Azure - QA Subscription
@ -288,21 +272,21 @@ jobs: @@ -288,21 +272,21 @@ jobs:
- name: Pull versioned image
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
REGISTRY: bitwardenqa.azurecr.io
run: docker pull $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION
run: docker pull $REGISTRY/$PROJECT_NAME:$_RELEASE_VERSION
- name: Tag latest
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
REGISTRY: bitwardenqa.azurecr.io
run: docker tag $REGISTRY/$SERVICE_NAME:$_RELEASE_VERSION $REGISTRY/$SERVICE_NAME:latest
run: docker tag $REGISTRY/$PROJECT_NAME:$_RELEASE_VERSION $REGISTRY/$PROJECT_NAME:latest
- name: Push version and latest image
env:
SERVICE_NAME: ${{ steps.setup.outputs.service_name }}
PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
REGISTRY: bitwardenqa.azurecr.io
run: docker push $REGISTRY/$SERVICE_NAME:latest
run: docker push $REGISTRY/$PROJECT_NAME:latest
- name: Log out of Docker
run: docker logout

5
DigitalOceanMarketplace/marketplace-image.json
Unescape View File

@ -62,7 +62,10 @@ @@ -62,7 +62,10 @@
"apt -qqy clean",
"curl -L \"https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)\" -o /usr/local/bin/docker-compose",
"chmod +x /usr/local/bin/docker-compose",
"rm -rf /opt/digitalocean"
"rm -rf /opt/digitalocean",
"echo > /var/log/auth.log",
"echo > /var/log/kern.log",
"echo > /var/log/ufw.log"
]
},
{

2
DigitalOceanMarketplace/scripts/99-img-check.sh
Unescape View File

@ -506,7 +506,7 @@ osv=0 @@ -506,7 +506,7 @@ osv=0
if [[ $OS == "Ubuntu" ]]; then
ost=1
if [[ $VER == "22.04" ]] || [[ $VER == "20.04" ]] || [[ $VER == "18.04" ]] || [[ $VER == "16.04" ]]; then
if [[ $VER == "22.10" ]] || [[ $VER == "22.04" ]] || [[ $VER == "20.04" ]] || [[ $VER == "18.04" ]] || [[ $VER == "16.04" ]]; then
osv=1
fi

Write Preview
Loading…
Cancel
Save