diff --git a/README_AWS.md b/README_AWS.md index 5201d9b7..171d73d3 100644 --- a/README_AWS.md +++ b/README_AWS.md @@ -16,6 +16,17 @@ Login using [AWS Session Manager](README_SETUP_RELEASE.md) # install openjdk brew install openjdk@17 +# on arm64 macOS +# https://earthly.dev/blog/homebrew-on-m1/ +echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/ec2-user/.zprofile +eval "$(/opt/homebrew/bin/brew shellenv)" + +# on arm64 macOS +# if not set it seems like Ruby is having certificate verification issues such as: +# 'certificate verify failed (unable to get local issuer certificate)'' +echo 'export SSL_CERT_FILE=/etc/ssl/cert.pem' >> /Users/ec2-user/.zprofile +export SSL_CERT_FILE=/etc/ssl/cert.pem + # symlink openjdk # depending on install location use one of these: sudo ln -sfn /usr/local/opt/openjdk@17/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-17.jdk diff --git a/server/scripts/publish-darwin-dev.sh b/server/scripts/publish-darwin-dev.sh new file mode 100755 index 00000000..10c5d283 --- /dev/null +++ b/server/scripts/publish-darwin-dev.sh @@ -0,0 +1,27 @@ +#!/bin/bash -e + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SOURCE_DIR=${SCRIPT_DIR}/../.. + +VERSION=$(date "+%Y%m%d_%H%M") + +PRODUCTION_VARIANT=dev +TARGET_HOST_URL=build-darwin-${PRODUCTION_VARIANT}.defold.com +TARGET_HOST=i-0d371683f5c876b73 +TARGET_USER=ec2-user +TARGET_DIR=/usr/local/extender-${PRODUCTION_VARIANT} +TARGET_KEY=~/.ssh/defold2_ec2.pem + +source ${SCRIPT_DIR}/standalone/publish-standalone.sh + +check_uncommitted_changes ${SOURCE_DIR} +build_artifact ${SOURCE_DIR} +deploy_artifact ${SOURCE_DIR} ${TARGET_DIR} ${VERSION} ${TARGET_HOST} ${TARGET_USER} ${TARGET_KEY} ${PRODUCTION_VARIANT} + +SERVER=https://${TARGET_HOST_URL} + +echo "**********************************" +echo "Checking the server version at ${SERVER}:" +wget -q -O - $SERVER +echo "" +echo "**********************************" diff --git a/server/src/main/resources/application-dev.yml b/server/src/main/resources/application-dev.yml index 0aa9304e..b210ec75 100644 --- a/server/src/main/resources/application-dev.yml +++ b/server/src/main/resources/application-dev.yml @@ -1,15 +1,13 @@ extender: - sdk: - cache-clear-on-exit: false + sdk.cache-size: 5 cache: + type: S3 + s3.bucket: defold-extender-cache-dev + remote-builder: enabled: true - type: LOCAL - local.basedir: /var/extender/cache/data - #type: S3 - #s3.bucket: defold-extender-cache-dev + url: https://build-darwin-dev.defold.com - remote-builder: - enabled: false - # This points to the host machine from inside docker - url: http://host.docker.internal:9010 +endpoints: + health: + sensitive: true diff --git a/server/src/main/resources/application-local.yaml b/server/src/main/resources/application-local.yaml new file mode 100644 index 00000000..0aa9304e --- /dev/null +++ b/server/src/main/resources/application-local.yaml @@ -0,0 +1,15 @@ + +extender: + sdk: + cache-clear-on-exit: false + cache: + enabled: true + type: LOCAL + local.basedir: /var/extender/cache/data + #type: S3 + #s3.bucket: defold-extender-cache-dev + + remote-builder: + enabled: false + # This points to the host machine from inside docker + url: http://host.docker.internal:9010 diff --git a/server/src/main/resources/application-standalone-dev.yml b/server/src/main/resources/application-standalone-dev.yml index e41626fe..d0ad4e80 100644 --- a/server/src/main/resources/application-standalone-dev.yml +++ b/server/src/main/resources/application-standalone-dev.yml @@ -3,7 +3,9 @@ server: port: 9010 extender: - sdk.location: /usr/local/extender/sdk + sdk: + location: /usr/local/extender-dev/sdk + cache-size: 5 cache: enabled: false remote-builder: