Seceng 260/sync with upstream #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add a github action to sync upstream branch to staging * remove trailing space from github action * fix yamllint errors * fix yaml lint issues * relax yamllint config rules * fix yamllint rules config * lint App.tsx * restore hopper config * update yamllint rules config
* add selenium docker image to test yopass secret retrieval * fix typo in circle config * fix circle config * update docker-compose config for yopass container * add missing checkout step to docker compose task * add setup_remote_docker config for circleci * increase wait time and echo selenium result * use f-string to populate yopass test url in selenium test * debug docker compose ICC issue * attempt to connect to yopass container via ip * take out network debug lines from circleci config * remove custom bridged network to debug * remove old network config from docker compose * update url for selenium test * updated docker-compose config * re-add internal bridged network to docker * include no cache arg to docker compose
|
Could not find org verified email for user ayodele-ademeso. Either they need to add an org verified e-mail or something went wrong when retrieving their e-mail. You'll have to nudge them some other way for now. :( |
|
Not notifying user samcrang. User has Nudgebot notifications muted. |
CarlingKnight
approved these changes
Sep 20, 2024
.circleci/config.yml
Outdated
| command: | | ||
| docker compose build --no-cache | ||
| docker compose up -d | ||
| sleep 10 |
There was a problem hiding this comment.
Assuming this is us waiting a period of time for the test to finish, can we do a watch with a timeout instead?
There was a problem hiding this comment.
replaced the sleep with the --wait flag for docker compose to wait until the containers are healthy, still need a sleep statement as at the moment if I run the docker logs command it fails immediately, if I put in the pause it gives the selenium test enough time to complete and add the log message.
…tainers when done
…pdated github action to raise a PR on sync
This comment was marked as resolved.
This comment was marked as resolved.
CarlingKnight
approved these changes
Sep 27, 2024
roo-ahine
added a commit
that referenced
this pull request
Oct 10, 2024
* Seceng 260/sync with upstream (#36) * add a github action to sync upstream branch to staging (#34) * add a github action to sync upstream branch to staging * remove trailing space from github action * fix yamllint errors * fix yaml lint issues * relax yamllint config rules * fix yamllint rules config * lint App.tsx * restore hopper config * update yamllint rules config * add selenium docker image to test yopass secret retrieval (#35) * add selenium docker image to test yopass secret retrieval * fix typo in circle config * fix circle config * update docker-compose config for yopass container * add missing checkout step to docker compose task * add setup_remote_docker config for circleci * increase wait time and echo selenium result * use f-string to populate yopass test url in selenium test * debug docker compose ICC issue * attempt to connect to yopass container via ip * take out network debug lines from circleci config * remove custom bridged network to debug * remove old network config from docker compose * update url for selenium test * updated docker-compose config * re-add internal bridged network to docker * include no cache arg to docker compose * update circleci config and remove comment from selenium script * add newline to end of docker compose file * add newline to end of docker compose file * replace sleep with wait argument for docker compose and tear down containers when done * update docker to wait for healthy containers and re-added sleep and updated github action to raise a PR on sync * remove trailing space for github action * revert file perms for hopper config * fix sync github action for adding upstream repo (#39) * PSC-2063 scan for container vulnerabilities (#38) * PSC-2063 scan for container vulnerabilities * PSC-2063 scan for container vulnerabilities * PSC-2063 scan for container vulnerabilities * use correct upstream branch (#40) * bump go version to patch critical vulnerability * fix conflict for gh action --------- Co-authored-by: tdeshapriya <100767314+tdeshapriya@users.noreply.github.com>
roo-ahine
added a commit
that referenced
this pull request
Oct 10, 2024
* Seceng 260/sync with upstream (#36) * add a github action to sync upstream branch to staging (#34) * add a github action to sync upstream branch to staging * remove trailing space from github action * fix yamllint errors * fix yaml lint issues * relax yamllint config rules * fix yamllint rules config * lint App.tsx * restore hopper config * update yamllint rules config * add selenium docker image to test yopass secret retrieval (#35) * add selenium docker image to test yopass secret retrieval * fix typo in circle config * fix circle config * update docker-compose config for yopass container * add missing checkout step to docker compose task * add setup_remote_docker config for circleci * increase wait time and echo selenium result * use f-string to populate yopass test url in selenium test * debug docker compose ICC issue * attempt to connect to yopass container via ip * take out network debug lines from circleci config * remove custom bridged network to debug * remove old network config from docker compose * update url for selenium test * updated docker-compose config * re-add internal bridged network to docker * include no cache arg to docker compose * update circleci config and remove comment from selenium script * add newline to end of docker compose file * add newline to end of docker compose file * replace sleep with wait argument for docker compose and tear down containers when done * update docker to wait for healthy containers and re-added sleep and updated github action to raise a PR on sync * remove trailing space for github action * revert file perms for hopper config * fix sync github action for adding upstream repo (#39) * PSC-2063 scan for container vulnerabilities (#38) * PSC-2063 scan for container vulnerabilities * PSC-2063 scan for container vulnerabilities * PSC-2063 scan for container vulnerabilities * use correct upstream branch (#40) * bump go version to patch critical vulnerability * fix conflict for gh action * bump golang version in Dockerfile to patch critical vuln --------- Co-authored-by: tdeshapriya <100767314+tdeshapriya@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SECENG-260
masterbranch tostagingto test initially with the aim to eventually sync to the forkedmasterbranch in this repo.