Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Rebase FASJSON OS image on F34

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2021-05-10 12:16:27 +02:00
parent 32f184f54b
commit 9b77fd9450
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openshift-apps/fasjson/templates/Dockerfile
View file

@ -1,4 +1,4 @@
FROM fedora:32 FROM fedora:34
LABEL \ LABEL \
name="fasjson" \ name="fasjson" \
vendor="Fedora Infrastructure" \ vendor="Fedora Infrastructure" \

8
roles/openshift-apps/fasjson/templates/buildconfig.yml
View file

@ -24,11 +24,13 @@ spec:
triggers: triggers:
- type: ConfigChange - type: ConfigChange
- type: ImageChange - type: ImageChange
- type: GitHub
{% if fasjson_stg_github_secret is defined and env == 'staging' %} {% if fasjson_stg_github_secret is defined and env == 'staging' %}
- type: GitHub
github: github:
secret: "{{ fasjson_stg_github_secret }}" secret: "{{ fasjson_stg_github_secret }}"
{% elif fasjson_github_secret is defined and env == 'production' %} {% elif fasjson_github_secret is defined and env == 'production' %}
github: # Do we really want auto rebuilds in prod?
secret: "{{ fasjson_github_secret }}" # - type: GitHub
# github:
# secret: "{{ fasjson_github_secret }}"
{% endif %} {% endif %}