Skip to content

Commit

Permalink
Preprod to Main (#325)
Browse files Browse the repository at this point in the history
* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Update README.md

* add console logs on default accounts setup and on sign request

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* add more static js to Cache-Control

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* add configuration for polygon and update addresses

* update configs atrribute for polygon

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Documentation changes, Yarn update (#303)

* Yarn update

* Deployment doc update

* Better enc key generation

* Preprod (#302)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>

* Go 1.18 in CircleCI

* Go 1.18

* Go update

* Go update

* Vue-cli pinned to 4.x

* CircleCI builder

* Add go-bindata install

* Add gopath to CircleCI

* CircleCI config, go install

* Go update, go-ethereum Azimir

* Go 1.20

* make fmt

* Go-bindata again

* README

* Image based test-ui

* Sync nodejs ver in test-ui

* Add libxtst6 library for Cypress

* Add full deps for Cypress

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* update support for sopelia network in the code and docs

* update go mod

* Light script for Docker

* Network usage notes

* Go modules updated

* Feature/fix web3 method from ascii (#312)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update from ascii call in web3 (#313)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update CircleCI build config

* yarn lock conflicts resolve

* Update Go modules (#323)

* Yarn update

* Deployment doc update

* Better enc key generation

* Go 1.18 in CircleCI

* Go 1.18

* Go update

* Go update

* Vue-cli pinned to 4.x

* CircleCI builder

* Add go-bindata install

* Add gopath to CircleCI

* CircleCI config, go install

* Go update, go-ethereum Azimir

* Go 1.20

* make fmt

* Go-bindata again

* README

* Image based test-ui

* Sync nodejs ver in test-ui

* Add libxtst6 library for Cypress

* Add full deps for Cypress

* Quickstart docs

* Sepolia support merge preprod to main (#309)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Update README.md

* add console logs on default accounts setup and on sign request

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* add more static js to Cache-Control

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* add configuration for polygon and update addresses

* update configs atrribute for polygon

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Documentation changes, Yarn update (#303)

* Yarn update

* Deployment doc update

* Better enc key generation

* Preprod (#302)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>

* Go 1.18 in CircleCI

* Go 1.18

* Go update

* Go update

* Vue-cli pinned to 4.x

* CircleCI builder

* Add go-bindata install

* Add gopath to CircleCI

* CircleCI config, go install

* Go update, go-ethereum Azimir

* Go 1.20

* make fmt

* Go-bindata again

* README

* Image based test-ui

* Sync nodejs ver in test-ui

* Add libxtst6 library for Cypress

* Add full deps for Cypress

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* update support for sopelia network in the code and docs

* update go mod

* Light script for Docker

* Network usage notes

* Go modules updated

* Feature/fix web3 method from ascii (#312)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update from ascii call in web3 (#313)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update CircleCI build config

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* Docker setup for local builds (#314)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Update README.md

* add console logs on default accounts setup and on sign request

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* add more static js to Cache-Control

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* add configuration for polygon and update addresses

* update configs atrribute for polygon

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Documentation changes, Yarn update (#303)

* Yarn update

* Deployment doc update

* Better enc key generation

* Preprod (#302)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>

* Go 1.18 in CircleCI

* Go 1.18

* Go update

* Go update

* Vue-cli pinned to 4.x

* CircleCI builder

* Add go-bindata install

* Add gopath to CircleCI

* CircleCI config, go install

* Go update, go-ethereum Azimir

* Go 1.20

* make fmt

* Go-bindata again

* README

* Image based test-ui

* Sync nodejs ver in test-ui

* Add libxtst6 library for Cypress

* Add full deps for Cypress

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* update support for sopelia network in the code and docs

* update go mod

* Light script for Docker

* Network usage notes

* Go modules updated

* Feature/fix web3 method from ascii (#312)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update from ascii call in web3 (#313)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update CircleCI build config

* Local Docker build support

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* Cleaned up CircleCI, added version release

* Yarn upgrade

* Go update #316

* Go modules

* Removed demo and staging from workflow

* Bump word-wrap from 1.2.3 to 1.2.4 in /ui (#321)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /test/e2e (#320)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /ui (#319)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Preprod merge to main (#317)



* update go mod

* Light script for Docker

* Network usage notes

* Go modules updated

* Feature/fix web3 method from ascii (#312)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update from ascii call in web3 (#313)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update CircleCI build config

* yarn lock conflicts resolve

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* Preprod merge to main (#322)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Update README.md

* add console logs on default accounts setup and on sign request

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* add more static js to Cache-Control

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* add configuration for polygon and update addresses

* update configs atrribute for polygon

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Documentation changes, Yarn update (#303)

* Yarn update

* Deployment doc update

* Better enc key generation

* Preprod (#302)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Test autodeploy flow (#290)

* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>

* Fix preview document bug (#295)

* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* The Watchtower service will never be used (#296)

* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>

* Add polygon configs (#301)

* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>

* Go 1.18 in CircleCI

* Go 1.18

* Go update

* Go update

* Vue-cli pinned to 4.x

* CircleCI builder

* Add go-bindata install

* Add gopath to CircleCI

* CircleCI config, go install

* Go update, go-ethereum Azimir

* Go 1.20

* make fmt

* Go-bindata again

* README

* Image based test-ui

* Sync nodejs ver in test-ui

* Add libxtst6 library for Cypress

* Add full deps for Cypress

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* update support for sopelia network in the code and docs

* update go mod

* Light script for Docker

* Network usage notes

* Go modules updated

* Feature/fix web3 method from ascii (#312)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update from ascii call in web3 (#313)

* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* Update CircleCI build config

* yarn lock conflicts resolve

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>

* Updated Go mods, downgrading x/exp due to go-ethereum/issues/27894

* Go fix, Yarn upgrade

* Revert to Debian Slim in Dockerfile

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: s-pro <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
Co-authored-by: Oleg Lavrovsky <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
7 people authored Aug 18, 2023
1 parent 81f46f3 commit 83dad38
Show file tree
Hide file tree
Showing 7 changed files with 1,319 additions and 1,584 deletions.
96 changes: 3 additions & 93 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,60 +219,9 @@ jobs:
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push $CONTAINER_IMAGE_NAME:latest
publish-staging:
executor: docker-publisher
steps:
- attach_workspace:
at: /tmp/workspace
- setup_remote_docker
- run:
name: Load archived Docker image
command: docker load -i /tmp/workspace/image.tar
- run:
name: Tag staging docker image
command: docker tag $CONTAINER_IMAGE_NAME $CONTAINER_IMAGE_NAME:staging
- run:
name: Publish staging Docker Image to Docker Hub
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push $CONTAINER_IMAGE_NAME:staging
publish-demo:
executor: docker-publisher
steps:
- attach_workspace:
at: /tmp/workspace
- setup_remote_docker
- run:
name: Load archived Docker image
command: docker load -i /tmp/workspace/image.tar
- run:
name: Tag demo docker image
command: docker tag $CONTAINER_IMAGE_NAME $CONTAINER_IMAGE_NAME:demo
- run:
name: Publish demo Docker Image to Docker Hub
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push $CONTAINER_IMAGE_NAME:demo
publish-handelsregister:
executor: docker-publisher
steps:
- attach_workspace:
at: /tmp/workspace
- setup_remote_docker
- run:
name: Load archived Docker image
command: docker load -i /tmp/workspace/image.tar
- run:
name: Tag handelsregister docker image
command: docker tag $CONTAINER_IMAGE_NAME $CONTAINER_IMAGE_NAME:handelsregister
- run:
name: Publish handelsregister Docker Image to Docker Hub
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push $CONTAINER_IMAGE_NAME:handelsregister
name: Tag the latest Docker release with current Git version
command: docker tag $CONTAINER_IMAGE_NAME:$CIRCLE_TAG $CONTAINER_IMAGE_NAME:latest

workflows:
version: 2
Expand Down Expand Up @@ -315,43 +264,4 @@ workflows:
- build-docker-image
filters:
branches:
only: main
- approve-staging:
type: approval
requires:
- build-docker-image
filters:
branches:
only: main
- publish-staging:
requires:
- approve-staging
filters:
branches:
only: main
- approve-demo:
type: approval
requires:
- publish-staging
filters:
branches:
only: main
- publish-demo:
requires:
- approve-demo
filters:
branches:
only: main
- approve-handelsregister:
type: approval
requires:
- publish-staging
filters:
branches:
only: main
- publish-handelsregister:
requires:
- approve-handelsregister
filters:
branches:
only: main
only: main
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,10 @@ coverage:
.PHONY: clean
clean:
cd artifacts && rm -rf `ls . | grep -v 'cache'`
echo "Clearing the JS cache"
cd ui && yarn cache clean && cd ..
echo "Clearing the Go module cache"
go clean -modcache

.PHONY: run
run: server
Expand Down
4 changes: 2 additions & 2 deletions docs/build_docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ docker-compose -f docker-compose.yml -f docker-compose-cloud.override.yml
There is also a Docker Compose configure in one file with a 'minimal' Proxeus installation. The only extra nodes are 'mail-sender' and 'json-sender':

```
docker-compose -f docker-compose-light.yml
```
docker-compose -f docker-compose-light.yml up
```
12 changes: 9 additions & 3 deletions docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ dependencies:
2. [Install docker-compose](https://docs.docker.com/compose/install/)


You easily deploy Proxeus using Docker. The repository includes several `docker-compose` YAML files that can be
used to deploy the platform in different context:
You easily deploy Proxeus using Docker. The repository includes several `docker-compose` YAML files that can be used to deploy the platform in different context:

* `docker-compose.yml`
* `docker-compose.override.yml`
* `docker-compose-cloud-override.yml`

In each case you can then use the **logs** command to see the system status (with the useful `-f` parameter):

`docker-compose logs`

For more usage instructions, visit the [Docker Compose CLI reference](https://docs.docker.com/compose/reference/).


## Simple Docker Compose

This is the simplest method to experiment with Proxeus. This will start a local Proxeus platform
Expand Down Expand Up @@ -148,7 +154,7 @@ with the `docker-compose.yml` file as described in [Multiple Compose files](http
It will add the required configuration to deploy Proxeus on a hosted VM for example on Google Cloud or AWS,
including
* [nginx](https://hub.docker.com/r/jwilder/nginx-proxy/) reverse proxy,
* [letsencrypt ](https://hub.docker.com/r/jrcs/letsencrypt-nginx-proxy-companion/) HTTPS provider and
* [letsencrypt](https://hub.docker.com/r/jrcs/letsencrypt-nginx-proxy-companion/) HTTPS provider and
* [watchtower](https://hub.docker.com/r/v2tec/watchtower/) automatic container update.

Please refer to [Use Compose in production](https://docs.docker.com/compose/production/) for more information about
Expand Down
52 changes: 23 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ module github.com/ProxeusApp/proxeus-core
go 1.20

require (
github.com/DataDog/zstd v1.5.2 // indirect
github.com/SparkPost/gosparkpost v0.2.0
github.com/asdine/storm v0.0.0-20190418133842-e0f77eada154
github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b
github.com/cespare/cp v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/disintegration/imaging v1.6.2
github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3
github.com/ethereum/go-ethereum v1.12.0
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127
github.com/ethereum/go-ethereum v1.12.1
github.com/fatih/structs v1.1.0 // indirect
github.com/golang/mock v1.6.0
github.com/google/go-querystring v1.1.0 // indirect
Expand All @@ -22,20 +21,18 @@ require (
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/labstack/gommon v0.4.0
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/onsi/gomega v1.27.8
github.com/onsi/gomega v1.27.10
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/robertkrimen/otto v0.2.1
github.com/satori/go.uuid v1.2.0
github.com/stretchr/testify v1.8.4
github.com/tidwall/pretty v1.1.0 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.mongodb.org/mongo-driver v1.11.7
golang.org/x/crypto v0.10.0
golang.org/x/net v0.10.0
golang.org/x/crypto v0.12.0
golang.org/x/net v0.14.0
gopkg.in/gavv/httpexpect.v2 v2.15.0
)

Expand All @@ -47,33 +44,30 @@ require (
github.com/go-stack/stack v1.8.1 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/echo-contrib v0.15.0
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/valyala/fasthttp v1.47.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/valyala/fasthttp v1.48.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
golang.org/x/image v0.8.0 // indirect
golang.org/x/image v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)

require go.mongodb.org/mongo-driver v1.12.1

require (
github.com/ajg/form v1.5.1 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/deckarep/golang-set/v2 v2.3.0 // indirect
github.com/deckarep/golang-set/v2 v2.3.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
Expand All @@ -82,10 +76,10 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
github.com/google/pprof v0.0.0-20230808223545-4887780b67fb // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/holiman/uint256 v1.2.2 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -99,15 +93,15 @@ require (
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yuin/goldmark v1.5.4 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/tools v0.9.1 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.12.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
moul.io/http2curl v1.0.1-0.20190925090545-5cd742060b0e // indirect
)
Expand All @@ -117,4 +111,4 @@ replace (
github.com/labstack/echo-contrib => github.com/labstack/echo-contrib v0.0.0-20180222075343-7d9d9632a4aa // fix https://github.com/ProxeusApp/proxeus-core/issues/216
gopkg.in/gavv/httpexpect.v2 => github.com/gavv/httpexpect/v2 v2.2.0 // fix https://github.com/gavv/httpexpect/issues/60
gopkg.in/urfave/cli.v1 => github.com/urfave/cli v1.22.5 // fix https://github.com/ProxeusApp/proxeus-core/issues/213
)
)
Loading

0 comments on commit 83dad38

Please sign in to comment.