Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pmanko committed Dec 9, 2024
1 parent 5cefc2e commit 8bec8cf
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 57 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/dockerhubES.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Create and publish Elastic Search Docker image to Docker hub
on:
push:
branches:
- "master"
- "main"
release:
workflow_dispatch:

env:
REGISTRY: docker.io
IMAGE_NAME: intrahealth/elasticsearch
IMAGE_NAME: uwdigi/elasticsearch-opencr

jobs:
build-and-push-es-image:
Expand All @@ -20,13 +20,13 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Log in to the Docker registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata for Docker
id: meta
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/dockerhubopencr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Create and publish OpencCR Docker image to Docker hub
on:
push:
branches:
- "master"
- "main"
release:
workflow_dispatch:

env:
REGISTRY: docker.io
IMAGE_NAME: intrahealth/opencr
IMAGE_NAME: uwdigi/opencr

jobs:
build-and-push-opencr-image:
Expand All @@ -20,28 +20,28 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Log in to the Docker registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch,pattern=main,latest=true
type=ref,event=tag
type=sha

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-
name: Build and push
uses: docker/build-push-action@v5
with:
context: ./docker/opencr
push: true
load: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{github.repository}}:latest
cache-to: type=inline
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: docs

on:
push:
branches:
- master
- main
# push:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: e2e
on:
push:
branches:
- master
- main
# push:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/hapilatest.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: hapilatest

on:
push:
branches:
- master
- main
# push:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/loginpage.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: loginpage

on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
# push:
# branches:
# - master
# - main
# pull_request:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: build

on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
# push:
# branches:
# - master
# - main
# pull_request:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: test

on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
# push:
# branches:
# - master
# - main
# pull_request:
# branches:
# - master
# - main
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "client-registry",
"version": "1.0.0",
"version": "4.0.5",
"description": "Client Registry",
"main": "app.js",
"scripts": {
Expand Down

0 comments on commit 8bec8cf

Please sign in to comment.