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

Arm builder plus split #25

Draft
wants to merge 177 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
819e8f7
Updates the actions to pull from the new branch, updates to add new s…
Nov 5, 2022
4bb5122
Updates the actions to pull from the new branch, updates to add new s…
Nov 5, 2022
58f6ab4
Update gitguardian.yaml
aprilrieger Nov 5, 2022
70c2b81
add registry env variable
aprilrieger Nov 5, 2022
876bea7
update with endpoint defined
Nov 5, 2022
1972ee9
tweaking per documentation here: https://github.com/actions-runner-co…
Nov 5, 2022
591e7f6
tweaks
Nov 5, 2022
c11f93c
tweaks
Nov 5, 2022
3949f96
tweaks
Nov 5, 2022
f99ea43
updates for testing the lint action error
Nov 5, 2022
3310169
adding tmate debugging session to troubleshoot error with running doc…
Nov 5, 2022
ac45d5b
fix copy pasta
aprilrieger Nov 5, 2022
65c87b7
found typo
Nov 5, 2022
2d39229
gathering more inforamtion to troubleshoot
Nov 5, 2022
d350354
tweaks to see where we are and how we can checkout the package regist…
Nov 5, 2022
37edfb4
updates to get more information while troubleshooting
Nov 5, 2022
d3fcbb6
more testing and tweaking
Nov 5, 2022
6c067c1
works locally, lets see if it works in CI now
Nov 5, 2022
0a52684
remove tmate
aprilrieger Nov 5, 2022
ecad26a
testing fail_on_failure flag and updates the docker compose syntax to…
Nov 6, 2022
e1128d2
remover the confdir
Nov 6, 2022
3966f17
remover the confdir
Nov 6, 2022
224c6d6
Updatung the retag to print out some information for troubleshooting,…
Nov 6, 2022
9c34970
move the -T flag not seeing that tty is set by default in the docker …
Nov 6, 2022
94f451c
prepping to merge into main
Nov 6, 2022
6503626
Update readme, clean up syntax, add fall back env.tag, replace github…
Nov 6, 2022
d46a16c
didn't save in order to push
Nov 6, 2022
b1a9114
remove the tag since we are tagging it latest.
Nov 6, 2022
d0654b1
latest tag, add it to the image versus declaring it as a variable bc …
Nov 6, 2022
94209d0
Update build.yaml
aprilrieger Nov 6, 2022
4859b4e
Update lint.yaml
aprilrieger Nov 6, 2022
999f81d
Update retag.yaml
aprilrieger Nov 6, 2022
8b6a777
Update test.yaml
aprilrieger Nov 6, 2022
27fc580
put things back - to a point where my need for order messed up the or…
Nov 6, 2022
98df212
yaml syntax really keeps you on your toes eh?
Nov 6, 2022
30c060d
trying out a new config to troubleshoot why the docker exce image in …
Nov 6, 2022
9fdc9a7
troubleshooting tools
aprilrieger Nov 6, 2022
d0c69f9
make it docker run like lint
Nov 7, 2022
2f43f7c
testing out the fail_on_failure true flag
Nov 7, 2022
40040ac
tweaking for tests
Nov 7, 2022
0951010
syntax
Nov 7, 2022
a69e592
Update test.yaml
aprilrieger Nov 7, 2022
b7165e8
tweaks for tests
Nov 7, 2022
63c871b
Testing docker-compose commands on the runner again
Nov 7, 2022
a922a10
reverts to docker-compose commands
Nov 7, 2022
4110ad0
try installing docker-compose on setup
orangewolf Nov 8, 2022
02747e4
update syntax, update branch name, remove gitguardian and refrences
Nov 8, 2022
0c3446a
Update action.yaml
aprilrieger Nov 8, 2022
8b6140f
pretty-please
Nov 8, 2022
595aa57
ok now it wants accesss to the shell we are running the script with -…
Nov 8, 2022
7b08839
Updating the script syntax take 1
Nov 8, 2022
9af2ed1
trying this because I saw it somewhere and testing it here
Nov 8, 2022
77402a0
This works in the runners bash
Nov 8, 2022
0ab79f2
Shoot in the dark, im t
Nov 8, 2022
6b911ab
tweaks for testing the script
Nov 8, 2022
183ee13
Following documentation to find the path it needs for docker-compose …
Nov 8, 2022
f5bc4c7
ff from main, addition of sh versus bash
Nov 8, 2022
2a17977
tweaksz
Nov 8, 2022
7c4a988
I am tired but so close
Nov 8, 2022
345f096
add the chmod +x
Nov 8, 2022
8a11ea6
sudo?
Nov 8, 2022
5b4f905
print helpful info
Nov 8, 2022
c4b9a11
updates to script
Nov 8, 2022
b8c3141
update script
Nov 8, 2022
41922ea
update to add docker-compose to the runer
Nov 8, 2022
bcba554
be patient docker
Nov 8, 2022
e9874ca
move to env to the env setup section
Nov 8, 2022
df6db93
first you build it
orangewolf Nov 8, 2022
86cf194
Roxaaannne
orangewolf Nov 8, 2022
f6002ed
SSSSSSS
orangewolf Nov 9, 2022
b15ccdf
jio uses root as context
orangewolf Nov 9, 2022
b213875
support image names
orangewolf Nov 9, 2022
425d2be
updates the build to include a boolean for solr since arce needs solr…
Nov 9, 2022
c718488
build it and tag as latest so I can get both architecture images buil…
Nov 9, 2022
1198558
we have a registry, why not use it for the cache
Nov 9, 2022
5108341
providing solr build support for arces use-case
Nov 9, 2022
6c49184
providing solr build support for arces use-case
Nov 9, 2022
2b31477
subdirs for lint/test
orangewolf Nov 9, 2022
49c2d11
missed one
orangewolf Nov 9, 2022
3228f85
submodule checkout
orangewolf Nov 10, 2022
953e1c7
update for utk v 3.8 - if works need to set dynamically somehow
Nov 10, 2022
b835bd6
Ah, learned something that this is the release for Docker/Compose and…
Nov 10, 2022
2e5dcf0
updates timeput to 360
Nov 11, 2022
8d6ebc6
another episode of Rob alphabetizes things. also support passing APP_…
orangewolf Nov 11, 2022
20187fc
Merge branch 'main' into with_subdir
orangewolf Nov 11, 2022
6cc75f4
ad the ability to specify a values file name before the -deploy.tmpl.yml
Nov 12, 2022
9276b90
dis too
Nov 12, 2022
ecf5040
Adds the addition of several ljk and hbk specific variables, Im not t…
Nov 12, 2022
312dbdf
Read a closed and solved issue where the user added a login to the re…
Nov 12, 2022
c8a23c8
Nope - revert
Nov 12, 2022
39e266f
trying out a different way to retag main to latest from this marketpl…
Nov 12, 2022
d953241
ok reading baout placement and they have it before the build block
Nov 12, 2022
8f47795
well, this needs to run inside the build so setting it up like the se…
Nov 12, 2022
fdf236b
update the syntax for merge to main
Nov 13, 2022
963da5c
removing the need for it to be main for testing purposes
Nov 13, 2022
fa4a766
read the documentation april
Nov 13, 2022
8885cbe
Updates the syntax for the tag to be latest and short sha
Nov 13, 2022
aebf8c7
syntax
Nov 13, 2022
453fe44
updates more updates
Nov 13, 2022
8b2a541
put that back - didnt mean to delete it
Nov 13, 2022
d33e82b
ah this is like css and js a bit
Nov 13, 2022
baa0c31
updates
Nov 13, 2022
3dd26e7
more tweaks as I test and learn
Nov 13, 2022
8e29b68
merge v0.0.3 into the branch and resolve merge conflicts and test on …
Nov 13, 2022
05b4a23
adding the ability to add a seperate solr build, push to the registry…
Nov 13, 2022
a0855f7
adds the ability to specify the confdir sinc eit varies by project
Nov 13, 2022
4dafeeb
adds the ability to specify the confdir sinc eit varies by project
Nov 13, 2022
0fae042
reverting and making pr
Nov 13, 2022
9564c3c
adding the retag action to the build stage and removing the retag wor…
Nov 13, 2022
23a9040
adding the retag to the build"
Nov 13, 2022
a8a3373
Revert to make PR
Nov 13, 2022
cbeca62
add the solr retag
Nov 13, 2022
6101f98
Removes a typo
Nov 13, 2022
3a5c4dd
wanting to see if the retag action is causing the tests to fail
Nov 14, 2022
7748a6c
updating cache
Nov 14, 2022
25ae463
update to add tag for sha
Nov 14, 2022
a12b541
syntax
Nov 14, 2022
67f2541
syntax
Nov 14, 2022
07c1c79
rename buildcache to latest - see if it works
Nov 14, 2022
d35b942
put the name buildcache back since it will build on every ci build, n…
Nov 14, 2022
fc27f71
add description to image_name
orangewolf Nov 14, 2022
5c24fab
Merge pull request #9 from scientist-softserv/add-solr-feature-flag
orangewolf Nov 14, 2022
3c16511
Merge branch 'main' into add-retag-to-build-action
orangewolf Nov 14, 2022
44a5e83
Merge pull request #12 from scientist-softserv/add-retag-to-build-action
orangewolf Nov 14, 2022
4a8cd71
Merge branch 'main' into with_subdir
aprilrieger Nov 14, 2022
87d87fd
Merge pull request #8 from scientist-softserv/with_subdir
labradford Nov 14, 2022
a64d003
removes the values name specification and updates the docker/setup-bu…
Nov 14, 2022
c610d20
updates to add a default confdir
Nov 14, 2022
ef7051e
merging main and ripping out confdir since in another pr
Nov 15, 2022
924e87a
ok here we go - had to straighten out some duplicates I saw
Nov 15, 2022
efe685a
add image name for deploy
orangewolf Nov 15, 2022
cdf4245
adding back the metadata tags for our retag system
Nov 15, 2022
3c22e20
adding the solr tag for the short sha
Nov 15, 2022
7eb92cc
There was a reason this was v1
Nov 15, 2022
6af16e5
Add the tags bacl
Nov 15, 2022
822f984
Merge pull request #13 from scientist-softserv/add-back-metadata-tags
orangewolf Nov 15, 2022
1ba223f
use the confdir
orangewolf Nov 15, 2022
d6bc3ea
add back v2
Nov 15, 2022
da6a1a5
merge main
Nov 15, 2022
81d64e4
Merge pull request #1 from scientist-softserv/self-hosted-runner
orangewolf Nov 15, 2022
770e228
the main is the thing
orangewolf Nov 15, 2022
0faa8bb
try a single arm builder
orangewolf Nov 16, 2022
71dab15
use internal network
orangewolf Nov 16, 2022
30bd941
try ssh auth
orangewolf Nov 16, 2022
f04d729
add env in case it is missing
orangewolf Nov 16, 2022
7199756
fix missing shell
orangewolf Nov 16, 2022
58c40fb
nevermind - too soon in process
orangewolf Nov 16, 2022
26c65eb
make sure .env is present
orangewolf Nov 16, 2022
8a45bdd
Merge pull request #14 from scientist-softserv/arm-y_of_one
bkiahstroud Nov 17, 2022
ea5ba82
Merge branch 'main' into add-ability-to-specify-confdir
bkiahstroud Nov 17, 2022
fd2d7c2
Merge pull request #11 from scientist-softserv/add-ability-to-specify…
bkiahstroud Nov 17, 2022
258d2d8
move duplicate confdir input from dispatch to call
bkiahstroud Nov 17, 2022
c45636a
Merge pull request #15 from scientist-softserv/fix-confdir-in-test
bkiahstroud Nov 17, 2022
3c099f0
update arm ip
orangewolf Nov 20, 2022
bb93018
Make sure schema is writeable
orangewolf Nov 20, 2022
93e4198
make sure schema is writeable
orangewolf Nov 20, 2022
f3140ba
solr cloud steps on solr cloud only
orangewolf Nov 23, 2022
f0ea115
no bash, no problems
orangewolf Nov 23, 2022
099d481
ok, some problems
orangewolf Nov 24, 2022
45de035
updates to macos-11 github runner testing arm64 build
aprilrieger Dec 6, 2022
02ef9a4
Updates to add specific platform and services to split out builds to …
aprilrieger Dec 6, 2022
077f082
updates syntax to clear error
aprilrieger Dec 6, 2022
0f58c61
updates actions to split platforms and web/worker/solr
aprilrieger Dec 6, 2022
3e852fc
adds repo env variable
aprilrieger Dec 6, 2022
fd7057c
set env repo
aprilrieger Dec 6, 2022
62a6bfa
syntax
aprilrieger Dec 6, 2022
d404266
repo_lower
aprilrieger Dec 6, 2022
4ea5dd5
lowercase
aprilrieger Dec 6, 2022
9e8a12f
tweaking syntax
aprilrieger Dec 6, 2022
92f753d
macos-11 doesnt like doencase - swap back to ubuntu-latest
aprilrieger Dec 6, 2022
370a686
add back qemu on ubuntu-latest
aprilrieger Dec 6, 2022
55fe375
add the right env back
aprilrieger Dec 6, 2022
d9b20be
add the right env back -- for realz
aprilrieger Dec 6, 2022
fce30d1
setup goes back to main
aprilrieger Dec 6, 2022
242541d
updates to ensure chmod is added to the test file from main
aprilrieger Dec 7, 2022
ce802ab
Merge pull request #18 from scientist-softserv/arm-wrestle
aprilrieger Dec 7, 2022
8b4b50c
dont tag image its set automatically to latest
aprilrieger Dec 7, 2022
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
repo_lower
aprilrieger committed Dec 6, 2022
commit d4042667cffd93feca994c0c4ad3b10fd474c687
4 changes: 2 additions & 2 deletions .github/workflows/build-solr-arm64.yaml
Original file line number Diff line number Diff line change
@@ -62,12 +62,12 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
cache-from: type=registry,ref=${{ steps.repo_slug.outputs.result }}/solr:${{ env.TAG }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/solr:${{ env.TAG }}
context: .
labels: ${{ steps.meta-solr.outputs.labels }}
platforms: linux/arm64
push: true
tags: |
${{ steps.meta-solr.outputs.tags }}
${{ steps.repo_slug.outputs.result }}/solr:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/solr:${{ env.TAG }}
target: ${{ inputs.target }}
4 changes: 2 additions & 2 deletions .github/workflows/build-solr.yaml
Original file line number Diff line number Diff line change
@@ -62,12 +62,12 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
cache-from: type=registry,ref=${{ steps.repo_slug.outputs.result }}/solr:${{ env.TAG }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/solr:${{ env.TAG }}
context: .
labels: ${{ steps.meta-solr.outputs.labels }}
platforms: linux/amd64
push: true
tags: |
${{ steps.meta-solr.outputs.tags }}
${{ steps.repo_slug.outputs.result }}/solr:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/solr:${{ env.TAG }}
target: ${{ inputs.target }}
4 changes: 2 additions & 2 deletions .github/workflows/build-web-arm64.yaml
Original file line number Diff line number Diff line change
@@ -62,12 +62,12 @@ jobs:
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
cache-from: type=registry,ref=${{ steps.repo_slug.outputs.result }}:${{ env.TAG }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${{ env.TAG }}
context: .
labels: ${{ steps.meta-web.outputs.labels }}
platforms: linux/arm64
push: true
tags: |
${{ steps.meta-web.outputs.tags }}
${{ steps.repo_slug.outputs.result }}:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${{ env.TAG }}
target: ${{ inputs.target }}
6 changes: 3 additions & 3 deletions .github/workflows/build-web.yaml
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ jobs:
id: meta-web
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.REPO }}
images: ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${{ env.TAG }}
tags: |
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
@@ -64,12 +64,12 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
cache-from: |
type=registry
ref=${{ steps.repo_slug.outputs.result }}:${{ env.TAG }}
ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${{ env.TAG }}
context: .
labels: ${{ steps.meta-web.outputs.labels }}
platforms: linux/amd64
push: true
tags: |
${{ steps.meta-web.outputs.tags }}
${{ steps.repo_slug.outputs.result }}:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}:${{ env.TAG }}
target: ${{ inputs.target }}
4 changes: 2 additions & 2 deletions .github/workflows/build-worker-arm64.yaml
Original file line number Diff line number Diff line change
@@ -64,12 +64,12 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
cache-from: |
type=registry
ref=${{ steps.repo_slug.outputs.result }}/worker:${{ env.TAG }}
ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/worker:${{ env.TAG }}
context: .
labels: ${{ steps.meta-worker.outputs.labels }}
platforms: linux/arm64
push: true
tags: |
${{ steps.meta-worker.outputs.tags }}
${{ steps.repo_slug.outputs.result }}/worker:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/worker:${{ env.TAG }}
target: ${{ inputs.target }}
6 changes: 3 additions & 3 deletions .github/workflows/build-worker.yaml
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ jobs:
id: meta-worker
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.REPO }}/worker
images: ${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/worker
tags: |
# set latest tag for default branch
type=raw,value=latest,enable={{is_default_branch}}
@@ -64,12 +64,12 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
cache-from: |
type=registry
ref=${{ steps.repo_slug.outputs.result }}/worker:${{ env.TAG }}
ref=${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/worker:${{ env.TAG }}
context: .
labels: ${{ steps.meta-worker.outputs.labels }}
platforms: linux/amd64
push: true
tags: |
${{ steps.meta-worker.outputs.tags }}
${{ steps.repo_slug.outputs.result }}/worker:${{ env.TAG }}
${{ env.REGISTRY }}/${{ env.REPO_LOWER }}/worker:${{ env.TAG }}
target: ${{ inputs.target }}
4 changes: 3 additions & 1 deletion setup-env/action.yaml
Original file line number Diff line number Diff line change
@@ -27,6 +27,8 @@ runs:
result-encoding: string
script: return 'ghcr.io/${{ inputs.image_name || github.repository }}'.toLowerCase()
- name: Downcase repo
env:
REPO_LOWER: "${{ steps.repo_slug.outputs.result }}"
shell: bash
run: |
echo "REPO=${ steps.repo_slug.outputs.result }" >> ${GITHUB_ENV}
echo "REPO_LOWER" >> ${GITHUB_ENV}