diff --git a/.github/workflows/release-docker-enterprise.yml b/.github/workflows/release-docker-enterprise.yml new file mode 100644 index 0000000000..a9aee5c1a5 --- /dev/null +++ b/.github/workflows/release-docker-enterprise.yml @@ -0,0 +1,72 @@ +name: Release Docker EE + +on: + workflow_run: + workflows: [Release NPM] + types: + - completed + +jobs: + docker: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [14.x] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Get branch names + id: branch-name + uses: tj-actions/branch-names@v5.2 + with: + strip_tag_prefix: v + + - name: Get the current tag + if: steps.branch-name.outputs.is_tag == 'true' # Replaces: startsWith(github.ref, 'refs/tags/') + run: | + echo "${{ steps.branch-name.outputs.tag }}" + + - uses: nowsprinting/check-version-format-action@v3 + id: version + with: + prefix: 'v' + + - name: Check is stable + if: ${{ steps.version.outputs.is_stable != 'true' }} + run: exit 0 + + - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-buildx-action@v1 + with: + driver-opts: network=host + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + steedos/steedos-enterprise + tags: | + type=ref,event=branch + type=ref,event=pr + type=schedule + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + + - uses: docker/login-action@v1 + name: Login Docker Hub + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push docker + uses: docker/build-push-action@v3 + with: + context: ./deploy/enterprise + platforms: linux/amd64,linux/arm64 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb2972ca44..601387617a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Build and publish +name: Release NPM on: push: diff --git a/.gitpod.yml b/.gitpod.yml index f5ca4b7536..4815391cc8 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -22,6 +22,9 @@ ports: - port: 5432 onOpen: ignore visibility: public + - port: 80 + onOpen: ignore + visibility: public # List the start up tasks. You can start them in parallel in multiple terminals. See https://www.gitpod.io/docs/config-start-tasks/ tasks: - name: Docker diff --git a/deploy/enterprise/docker-compose-external.yaml b/deploy/enterprise/docker-compose-external.yml similarity index 88% rename from deploy/enterprise/docker-compose-external.yaml rename to deploy/enterprise/docker-compose-external.yml index 9c39a5e9c7..28459061ab 100644 --- a/deploy/enterprise/docker-compose-external.yaml +++ b/deploy/enterprise/docker-compose-external.yml @@ -5,11 +5,8 @@ services: steedos: image: steedos/steedos-enterprise:latest ports: - - "80:80" # Nginx - - "443:443" # Nginx SSL - - "3000:3000" # Steedos Platform - - "3100:3100" # Unpkg - - "9001:9001" # Supervisor + - "80:80" + - "443:443" environment: - MONGO_URL=mongodb://mongodb:27017/steedos - MONGO_OPLOG_URL=mongodb://mongodb:27017/local @@ -18,7 +15,7 @@ services: - ROOT_URL=http://127.0.0.1:3000 volumes: - "./stacks:/steedos-stacks" - + tty: true depends_on: mongodb: condition: service_healthy diff --git a/deploy/enterprise/docker-compose.yml b/deploy/enterprise/docker-compose.yml index e526937ae5..0ff8ced3eb 100644 --- a/deploy/enterprise/docker-compose.yml +++ b/deploy/enterprise/docker-compose.yml @@ -8,13 +8,11 @@ services: dockerfile: ./Dockerfile image: steedos/steedos-enterprise:latest ports: - - "80:80" # Nginx - - "443:443" # Nginx SSL - - "3000:3000" # Steedos Platform - - "3100:3100" # Unpkg - - "9001:9001" # Supervisor + - "80:80" + - "443:443" environment: - ROOT_URL=http://127.0.0.1:3000 + tty: true volumes: - "./stacks:/steedos-stacks" \ No newline at end of file diff --git a/deploy/enterprise/fs/opt/steedos/entrypoint.sh b/deploy/enterprise/fs/opt/steedos/entrypoint.sh index 465c096014..13b8c2cb38 100755 --- a/deploy/enterprise/fs/opt/steedos/entrypoint.sh +++ b/deploy/enterprise/fs/opt/steedos/entrypoint.sh @@ -128,15 +128,15 @@ init_replica_set() { if [[ $isUriLocal -gt 0 ]]; then echo "Checking Replica Set of external MongoDB" - if appsmithctl check-replica-set; then - echo "MongoDB ReplicaSet is enabled" - else - echo -e "\033[0;31m***************************************************************************************\033[0m" - echo -e "\033[0;31m* MongoDB Replica Set is not enabled *\033[0m" - echo -e "\033[0;31m* Please ensure the credentials provided for MongoDB, has 'readWrite' role. *\033[0m" - echo -e "\033[0;31m***************************************************************************************\033[0m" - exit 1 - fi + # if appsmithctl check-replica-set; then + # echo "MongoDB ReplicaSet is enabled" + # else + # echo -e "\033[0;31m***************************************************************************************\033[0m" + # echo -e "\033[0;31m* MongoDB Replica Set is not enabled *\033[0m" + # echo -e "\033[0;31m* Please ensure the credentials provided for MongoDB, has 'readWrite' role. *\033[0m" + # echo -e "\033[0;31m***************************************************************************************\033[0m" + # exit 1 + # fi fi }