From 1c94a1ffcb7b0bcc9b743fb6c8f9c7d8127bbdba Mon Sep 17 00:00:00 2001 From: Michael Uti Date: Tue, 25 Jun 2024 02:41:44 +0100 Subject: [PATCH] chore: remove unused commands in ockam examples --- .../coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh | 1 - .../coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh | 1 - .../influxdb/amazon_timestream/aws_cli/metrics_corp/run.sh | 1 - .../portals/databases/mongodb/kubernetes/ockam.dockerfile | 4 +++- .../amazon_aurora/aws_cli/analysis_corp/run_ockam.sh | 1 - .../postgres/amazon_aurora/aws_cli/bank_corp/run_ockam.sh | 5 +---- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh index 58e9d0cf771..2796a5e84fd 100755 --- a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh +++ b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/analysis_corp/run.sh @@ -29,7 +29,6 @@ run() { # Create a security group to allow: # - TCP egress to the Internet # - SSH ingress from the local machine - my_ip=$(curl -4 -s https://httpbin.org/ip | jq -r '.origin') sg_id=$(aws ec2 create-security-group --group-name "${name}-sg" --vpc-id "$vpc_id" --query 'GroupId' \ --description "Allow TCP egress and Postgres ingress") aws ec2 authorize-security-group-egress --group-id "$sg_id" --cidr 0.0.0.0/0 --protocol tcp --port 0-65535 diff --git a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh index 2c9ba14e313..7ccaba24721 100755 --- a/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh +++ b/examples/command/portals/coderepos/gitlab/amazon_ec2/aws_cli/bank_corp/run.sh @@ -35,7 +35,6 @@ run() { # Create a security group to allow: # - TCP egress to the Internet # - Gitlab Access from local machine - my_ip=$(curl -4 -s https://httpbin.org/ip | jq -r '.origin') sg_id=$(aws ec2 create-security-group --group-name "${name}-sg" --vpc-id "$vpc_id" --query 'GroupId' \ --description "Allow TCP egress and gitlab ingress") aws ec2 authorize-security-group-egress --group-id "$sg_id" --cidr 0.0.0.0/0 --protocol tcp --port 0-65535 diff --git a/examples/command/portals/databases/influxdb/amazon_timestream/aws_cli/metrics_corp/run.sh b/examples/command/portals/databases/influxdb/amazon_timestream/aws_cli/metrics_corp/run.sh index 4e7b3d83414..da41e07a67f 100755 --- a/examples/command/portals/databases/influxdb/amazon_timestream/aws_cli/metrics_corp/run.sh +++ b/examples/command/portals/databases/influxdb/amazon_timestream/aws_cli/metrics_corp/run.sh @@ -38,7 +38,6 @@ run() { aws ec2 authorize-security-group-ingress --group-id "$sg_id" --cidr 10.0.0.0/24 --protocol tcp --port 8086 # Allow SSH from the machine where this script is running, so we can provision instances. - my_ip=$(curl -s https://checkip.amazonaws.com) aws ec2 authorize-security-group-ingress --group-id "$sg_id" --cidr "0.0.0.0/0" --protocol tcp --port 22 # ---------------------------------------------------------------------------------------------------------------- diff --git a/examples/command/portals/databases/mongodb/kubernetes/ockam.dockerfile b/examples/command/portals/databases/mongodb/kubernetes/ockam.dockerfile index 36ed28007d9..546ea06c6a4 100644 --- a/examples/command/portals/databases/mongodb/kubernetes/ockam.dockerfile +++ b/examples/command/portals/databases/mongodb/kubernetes/ockam.dockerfile @@ -9,7 +9,9 @@ # Read bank_corp/run_ockam.sh and analysis_corp/run_ockam.sh to understand # how each node is set up. -FROM ghcr.io/build-trust/ockam as builder +ARG OCKAM_VERSION=latest + +FROM ghcr.io/build-trust/ockam:${OCKAM_VERSION} as builder FROM cgr.dev/chainguard/bash COPY --from=builder /ockam /usr/local/bin/ockam diff --git a/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/analysis_corp/run_ockam.sh b/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/analysis_corp/run_ockam.sh index e622ecd4c86..ab422131eef 100755 --- a/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/analysis_corp/run_ockam.sh +++ b/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/analysis_corp/run_ockam.sh @@ -10,7 +10,6 @@ set -ex export OCKAM_VERSION="$OCKAM_VERSION" curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash source "$HOME/.ockam/env" -ockam --version # Run `ockam project enroll ...` # diff --git a/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/bank_corp/run_ockam.sh b/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/bank_corp/run_ockam.sh index 9b77f08d32c..21c347ddeff 100644 --- a/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/bank_corp/run_ockam.sh +++ b/examples/command/portals/databases/postgres/amazon_aurora/aws_cli/bank_corp/run_ockam.sh @@ -11,8 +11,6 @@ export OCKAM_VERSION="$OCKAM_VERSION" curl --proto '=https' --tlsv1.2 -sSfL https://install.command.ockam.io | bash source "$HOME/.ockam/env" -ockam --version - # Run `ockam project enroll ...` # # The `project enroll` command creates a new vault and generates a cryptographic identity with @@ -41,8 +39,7 @@ cat << EOF > outlet.yaml tcp-outlet: to: "$POSTGRES_ADDRESS:5432" allow: '(= subject.postgres-inlet "true")' - -relay: postgres + relay: postgres EOF ockam node create outlet.yaml