Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support universal base image #95

Merged
merged 32 commits into from
Jun 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
64006e4
baby steps
sandoichi May 21, 2020
153c8f3
build out some more steps
sandoichi May 21, 2020
34922cb
write file with base os
sandoichi May 26, 2020
d562174
add logic to select ubi image in mage targets
sandoichi May 26, 2020
c7a9757
use ubi instead of busybox when necessary for logging container; buil…
sandoichi May 27, 2020
6db60cf
unify gh workflows and simplify steps
sandoichi May 27, 2020
a7da497
fixup! unify gh workflows and simplify steps
sandoichi May 27, 2020
8aac13d
fixup! fixup! unify gh workflows and simplify steps
sandoichi May 27, 2020
bb6dc8a
add debug print
sandoichi May 27, 2020
c7f6fd4
fixup workflow tags to push
sandoichi May 27, 2020
55e0cff
trimspace on gh package tags
sandoichi May 27, 2020
6236cd7
fixup! trimspace on gh package tags
sandoichi May 27, 2020
c4e6295
more trimspace
sandoichi May 27, 2020
b75fb46
add in logic for choosing ubi based config builder image
sandoichi May 29, 2020
97e30c2
add in dse and config builder ubi coords
sandoichi Jun 5, 2020
89540fd
add oss c* 3.11.6 image
sandoichi Jun 16, 2020
14d4c91
prefix ioutil import
sandoichi Jun 16, 2020
288402c
Add debug cat cmd to gh action
sandoichi Jun 16, 2020
7c7cfb8
Merge remote-tracking branch 'origin/master' into support-universal-b…
sandoichi Jun 16, 2020
ce01958
add conditions around checkout rules in gh workflow to avoid merging
sandoichi Jun 16, 2020
0710032
Remove debug print in gh workflow
sandoichi Jun 16, 2020
472a65e
Merge remote-tracking branch 'origin/master' into support-universal-b…
sandoichi Jun 24, 2020
3c6c780
use separate dockerfile for ubi images
sandoichi Jun 25, 2020
cb76c87
only run docker build once now
sandoichi Jun 25, 2020
7808c31
debug print in workflow
sandoichi Jun 25, 2020
ab4f8b6
more debug
sandoichi Jun 25, 2020
0aaf87b
fixup! more debug
sandoichi Jun 25, 2020
0b385eb
fixup! fixup! more debug
sandoichi Jun 25, 2020
96080eb
fixup! fixup! fixup! more debug
sandoichi Jun 25, 2020
c1ff59c
use env constant instead of string; more gh workflow debugging
sandoichi Jun 25, 2020
44fb640
workflow should be in good shape now
sandoichi Jun 25, 2020
200bff9
use correct docker tags file for gh package pushing..
sandoichi Jun 25, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only run docker build once now
sandoichi committed Jun 25, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit cb76c87a998d0a99487ee6deff5a1788ef6df0ca
13 changes: 2 additions & 11 deletions .github/workflows/operatorBuildAndDeploy.yml
Original file line number Diff line number Diff line change
@@ -38,22 +38,13 @@ jobs:
run: |
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
mage operator:testGenerateClient
- name: Build docker - standard image
env:
MO_BRANCH: ${{ github.event.pull_request.head.ref }}
run: |
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
mage operator:testAndBuild
cat ./build/tagsToPush.txt > ./build/fullTagsToPush.txt
echo "|" >> ./build/fullTagsToPush.txt
- name: Build docker - ubi image
- name: Build docker - standard and ubi images
env:
MO_BRANCH: ${{ github.event.pull_request.head.ref }}
MO_BASE_OS: 'registry.access.redhat.com/ubi7/ubi-minimal:7.8'
run: |
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
mage operator:testAndBuild
cat ./build/tagsToPush.txt >> ./build/fullTagsToPush.txt
- name: Deploy to ECR
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-operator'
env:
@@ -62,7 +53,7 @@ jobs:
MO_ECR_REPO: ${{ secrets.ECR_REPO }}
run: |
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
export MO_TAGS=$(cat ./build/fullTagsToPush.txt)
export MO_TAGS=$(cat ./build/tagsToPush.txt)
mage operator:deployToECR
- name: Deploy to GH Packages
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-operator'