Skip to content

Commit

Permalink
Merge pull request #398 from deNBI/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
dweinholz authored Oct 10, 2023
2 parents c58c3d8 + de33e9a commit 1927107
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ jobs:
uses: rokroskar/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0
- run: docker build --no-cache .
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.1.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master-protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: rokroskar/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0

- name: Check Tag
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: rokroskar/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
Expand All @@ -27,15 +27,15 @@ jobs:
- name: Get tag
run: echo "The selected tag is ${{ steps.tag.outputs.TAG }}"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: Dockerfile
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}
- name: Build and publish image to Quay
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: Dockerfile
push: true
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ default_stages: [ commit ]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml

- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.9.1
hooks:
- id: black
- repo: https://github.com/sondrelg/pep585-upgrade
Expand All @@ -24,7 +24,7 @@ repos:
- id: isort

- repo: https://github.com/myint/autoflake
rev: v2.2.0
rev: v2.2.1
hooks:
- id: autoflake
args:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.bibigrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

simplevm_client_redis:
container_name: simplevm_client_redis
image: redis:7.2.0
image: redis:7.2.1
expose:
- "6379"
networks:
Expand All @@ -41,7 +41,7 @@ services:

# filebeat
simplevm_filebeat:
image: docker.elastic.co/beats/filebeat:8.9.1
image: docker.elastic.co/beats/filebeat:8.10.2
env_file:
- .env
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.bibigrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

client_redis:
container_name: simplevm_client_redis
image: redis:7.2.0
image: redis:7.2.1
expose:
- "6379"
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

client_redis:
container_name: simplevm_client_redis
image: redis:7.2.0
image: redis:7.2.1
expose:
- "6379"
networks:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

simplevm_client_redis:
container_name: simplevm_client_redis
image: redis:7.2.0
image: redis:7.2.1
expose:
- "6379"
networks:
Expand All @@ -27,7 +27,7 @@ services:
# filebeat
simplevm_client_filebeat:
container_name: simplevm_client_filebeat
image: docker.elastic.co/beats/filebeat:8.9.1
image: docker.elastic.co/beats/filebeat:8.10.2
env_file:
- .env
volumes:
Expand Down
1 change: 1 addition & 0 deletions plays/setup_client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
slurp:
src: "{{ client.REPO_PATH }}/.ansible_environment"
register: existing_content
tags: always

- name: Append variables with empty line to .env
lineinfile:
Expand Down
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
setuptools==68.1.2
setuptools==68.2.2
thrift==0.16.0
python-keystoneclient==5.1.0
openstacksdk==1.4.0
python-keystoneclient==5.2.0
openstacksdk==1.5.0
deprecated==1.2.14
Click==8.1.7
ansible==8.3.0
ansible==8.4.0
flake8==6.1.0
paramiko==2.12.0
ruamel.yaml==0.17.32
ruamel.yaml==0.17.35
pyvim==3.0.3
redis==5.0.0
redis==5.0.1
requests==2.31.0
pyyaml==6.0.1
pre-commit==3.3.3
types-PyYAML==6.0.12.11
pre-commit==3.4.0
types-PyYAML==6.0.12.12
sympy==1.12
types-redis==4.6.0.5
types-redis==4.6.0.7
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ roles:


- name: andrewrothstein.miniconda
version: v6.1.9
version: v6.2.0

- name: andrewrothstein.conda-env

0 comments on commit 1927107

Please sign in to comment.