Skip to content

Commit

Permalink
JIRA-SL-XXX: restore support for bionic230-amazonlinux (#768)
Browse files Browse the repository at this point in the history 
* JIRA-SL-XXX: restore suport for bionic230-amazonlinux

* JIRA-SL-XX: updated rails

* JIRA-SL-XXX: restore suport for bionic230-amazonlinux
  • Loading branch information
@jfederico
jfederico authored Mar 11, 2022
1 parent de8896a commit 1b36b76
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 53 deletions.
53 changes: 52 additions & 1 deletion .github/workflows/ci.build.prerelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-230 with alpine
# Alternate Images for bbb-bionic-240 with alpine
- name: Alternate Alpine Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -148,6 +148,57 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-230 with amazonlinux
- name: Alternate Amazon Linux Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: nginx
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release.outputs.tag }}-bionic230-amazonlinux-nginx"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push api
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: api
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release.outputs.tag }}-bionic230-amazonlinux"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release.outputs.tag }}-bionic230-amazonlinux-api"
build-args: "BUILD_NUMBER=${{ steps.ci_tag_release.outputs.tag }}"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push poller
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: poller
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release.outputs.tag }}-bionic230-amazonlinux-poller"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push recording-importer
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: recording-importer
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release.outputs.tag }}-bionic230-amazonlinux-recording-importer"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-240 with amazonlinux
- name: Alternate Amazon Linux Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
Expand Down
63 changes: 62 additions & 1 deletion .github/workflows/ci.build.release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-230 with alpine
# Alternate Images for bbb-bionic-240 with alpine
- name: Alternate Alpine Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -180,6 +180,67 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-230 with amazonlinux
- name: Alternate Amazon Linux Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: nginx
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_major.outputs.tag }}-bionic230-amazonlinux-nginx"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_minor.outputs.tag }}-bionic230-amazonlinux-nginx"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_revision.outputs.tag }}-bionic230-amazonlinux-nginx"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push api
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: api
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_major.outputs.tag }}-bionic230-amazonlinux"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_minor.outputs.tag }}-bionic230-amazonlinux"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_revision.outputs.tag }}-bionic230-amazonlinux"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_major.outputs.tag }}-bionic230-amazonlinux-api"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_minor.outputs.tag }}-bionic230-amazonlinux-api"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_revision.outputs.tag }}-bionic230-amazonlinux-api"
build-args: "BUILD_NUMBER=${{ steps.ci_tag_release_revision.outputs.tag }}"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push poller
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: poller
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_major.outputs.tag }}-bionic230-amazonlinux-poller"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_minor.outputs.tag }}-bionic230-amazonlinux-poller"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_revision.outputs.tag }}-bionic230-amazonlinux-poller"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Alternate Amazon Linux Build and Push recording-importer
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
with:
file: dockerfiles/v1/bionic230-amazonlinux
push: true
target: recording-importer
tags: |
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_major.outputs.tag }}-bionic230-amazonlinux-recording-importer"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_minor.outputs.tag }}-bionic230-amazonlinux-recording-importer"
"${{ steps.ci_docker_repository.outputs.repository }}:${{ steps.ci_tag_release_revision.outputs.tag }}-bionic230-amazonlinux-recording-importer"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

# Alternate Images for bbb-bionic-240 with amazonlinux
- name: Alternate Amazon Linux Build and Push nginx
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
uses: docker/build-push-action@v2
Expand Down
102 changes: 51 additions & 51 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,56 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.4.6)
actionpack (= 6.0.4.6)
actioncable (6.0.4.7)
actionpack (= 6.0.4.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.4.6)
actionpack (= 6.0.4.6)
activejob (= 6.0.4.6)
activerecord (= 6.0.4.6)
activestorage (= 6.0.4.6)
activesupport (= 6.0.4.6)
actionmailbox (6.0.4.7)
actionpack (= 6.0.4.7)
activejob (= 6.0.4.7)
activerecord (= 6.0.4.7)
activestorage (= 6.0.4.7)
activesupport (= 6.0.4.7)
mail (>= 2.7.1)
actionmailer (6.0.4.6)
actionpack (= 6.0.4.6)
actionview (= 6.0.4.6)
activejob (= 6.0.4.6)
actionmailer (6.0.4.7)
actionpack (= 6.0.4.7)
actionview (= 6.0.4.7)
activejob (= 6.0.4.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.4.6)
actionview (= 6.0.4.6)
activesupport (= 6.0.4.6)
actionpack (6.0.4.7)
actionview (= 6.0.4.7)
activesupport (= 6.0.4.7)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.4.6)
actionpack (= 6.0.4.6)
activerecord (= 6.0.4.6)
activestorage (= 6.0.4.6)
activesupport (= 6.0.4.6)
actiontext (6.0.4.7)
actionpack (= 6.0.4.7)
activerecord (= 6.0.4.7)
activestorage (= 6.0.4.7)
activesupport (= 6.0.4.7)
nokogiri (>= 1.8.5)
actionview (6.0.4.6)
activesupport (= 6.0.4.6)
actionview (6.0.4.7)
activesupport (= 6.0.4.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.4.6)
activesupport (= 6.0.4.6)
activejob (6.0.4.7)
activesupport (= 6.0.4.7)
globalid (>= 0.3.6)
activemodel (6.0.4.6)
activesupport (= 6.0.4.6)
activerecord (6.0.4.6)
activemodel (= 6.0.4.6)
activesupport (= 6.0.4.6)
activestorage (6.0.4.6)
actionpack (= 6.0.4.6)
activejob (= 6.0.4.6)
activerecord (= 6.0.4.6)
activemodel (6.0.4.7)
activesupport (= 6.0.4.7)
activerecord (6.0.4.7)
activemodel (= 6.0.4.7)
activesupport (= 6.0.4.7)
activestorage (6.0.4.7)
actionpack (= 6.0.4.7)
activejob (= 6.0.4.7)
activerecord (= 6.0.4.7)
marcel (~> 1.0.0)
activesupport (6.0.4.6)
activesupport (6.0.4.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -124,29 +124,29 @@ GEM
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.4.6)
actioncable (= 6.0.4.6)
actionmailbox (= 6.0.4.6)
actionmailer (= 6.0.4.6)
actionpack (= 6.0.4.6)
actiontext (= 6.0.4.6)
actionview (= 6.0.4.6)
activejob (= 6.0.4.6)
activemodel (= 6.0.4.6)
activerecord (= 6.0.4.6)
activestorage (= 6.0.4.6)
activesupport (= 6.0.4.6)
rails (6.0.4.7)
actioncable (= 6.0.4.7)
actionmailbox (= 6.0.4.7)
actionmailer (= 6.0.4.7)
actionpack (= 6.0.4.7)
actiontext (= 6.0.4.7)
actionview (= 6.0.4.7)
activejob (= 6.0.4.7)
activemodel (= 6.0.4.7)
activerecord (= 6.0.4.7)
activestorage (= 6.0.4.7)
activesupport (= 6.0.4.7)
bundler (>= 1.3.0)
railties (= 6.0.4.6)
railties (= 6.0.4.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (6.0.4.6)
actionpack (= 6.0.4.6)
activesupport (= 6.0.4.6)
railties (6.0.4.7)
actionpack (= 6.0.4.7)
activesupport (= 6.0.4.7)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
Expand Down Expand Up @@ -180,7 +180,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (4.0.2)
sprockets (4.0.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
Expand Down

0 comments on commit 1b36b76

Please sign in to comment.