Skip to content

Commit

Permalink
Seceng xxx/bump go version (#45)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
roo-ahine and tdeshapriya authored Oct 10, 2024
1 parent 4f6d9b5 commit 042d35f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ workflows:
<<: *global_context
- add_and_retrieve_test_secret:
<<: *global_context
<<: *filter_staging_branch
requires:
- build_docker_image
- push_ecr_image_to_staging:
Expand All @@ -141,5 +142,3 @@ workflows:
- push_ecr_image_to_production:
<<: *global_context
<<: *filter_master_branch
requires:
- add_and_retrieve_test_secret
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM deliveroo/hopper-runner:1 as runner

FROM golang:buster as app
FROM golang:bookworm as app
RUN mkdir -p /yopass
WORKDIR /yopass
COPY . .
Expand Down

0 comments on commit 042d35f

Please sign in to comment.