Skip to content

Commit

Permalink
Merge pull request #88 from EpicMorg/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
stamepicmorg authored Oct 16, 2022
2 parents 1a4d8d4 + c51d57b commit 76a70c2
Show file tree
Hide file tree
Showing 46 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/epicmorg.advanced.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/epicmorg.advanced.nextcloud.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/epicmorg.advanced.vscode.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/epicmorg.advanced.zabbix.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/epicmorg.base.images.legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/epicmorg.base.images.nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/epicmorg.base.images.perforce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
needs: build-p4-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/epicmorg.base.images.postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/epicmorg.base.images.python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
needs: build-python-base-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/epicmorg.base.images.teamcity.agents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -32,7 +32,7 @@ jobs:
needs: build-tca-main-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/epicmorg.base.images.testrail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# needs: build-php-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -42,7 +42,7 @@ jobs:
# needs: build-php-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -66,7 +66,7 @@ jobs:
# needs: build-php-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/epicmorg.base.images.web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
needs: build-php-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
needs: build-php-images

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/epicmorg.ecosysctem.misc.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -116,7 +116,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -133,7 +133,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand All @@ -150,7 +150,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout
- uses: actions/checkout@v3
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2023 EpicMorg: Main
Copyright (c) 2009 EpicMorg

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 76a70c2

Please sign in to comment.