From 1fac45f084a9fa676100e7dd5f9f41524b0383ca Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Sat, 11 Jan 2025 20:38:14 -0800 Subject: [PATCH] define PORT --- .kamal/hooks/docker-setup.sample | 2 +- .kamal/hooks/post-deploy.sample | 2 +- .kamal/hooks/post-proxy-reboot.sample | 2 +- .kamal/hooks/pre-build.sample | 6 +++--- config/deploy.yml | 15 ++++++--------- packages/utils/src/image.spec.ts | 2 +- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.kamal/hooks/docker-setup.sample b/.kamal/hooks/docker-setup.sample index 2fb07d7..1d8f2a3 100755 --- a/.kamal/hooks/docker-setup.sample +++ b/.kamal/hooks/docker-setup.sample @@ -1,3 +1,3 @@ #!/bin/sh -echo "Docker set up on $KAMAL_HOSTS..." +echo ">>>>>>>>>>>>>>>> Docker set up on $KAMAL_HOSTS..." diff --git a/.kamal/hooks/post-deploy.sample b/.kamal/hooks/post-deploy.sample index 75efafc..f0d8179 100755 --- a/.kamal/hooks/post-deploy.sample +++ b/.kamal/hooks/post-deploy.sample @@ -11,4 +11,4 @@ # KAMAL_DESTINATION (if set) # KAMAL_RUNTIME -echo "$KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds" +echo ">>>>>>>>>>>>>>>> $KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds" diff --git a/.kamal/hooks/post-proxy-reboot.sample b/.kamal/hooks/post-proxy-reboot.sample index 1435a67..07a70a2 100755 --- a/.kamal/hooks/post-proxy-reboot.sample +++ b/.kamal/hooks/post-proxy-reboot.sample @@ -1,3 +1,3 @@ #!/bin/sh -echo "Rebooted kamal-proxy on $KAMAL_HOSTS" +echo ">>>>>>>>>>>>>>>> Rebooted kamal-proxy on $KAMAL_HOSTS" diff --git a/.kamal/hooks/pre-build.sample b/.kamal/hooks/pre-build.sample index f87d811..ff38252 100755 --- a/.kamal/hooks/pre-build.sample +++ b/.kamal/hooks/pre-build.sample @@ -32,19 +32,19 @@ fi current_branch=$(git branch --show-current) if [ -z "$current_branch" ]; then - echo "Not on a git branch, aborting..." >&2 + echo ">>>>>>>>>>>>>>>> Not on a git branch, aborting..." >&2 exit 1 fi remote_head=$(git ls-remote $first_remote --tags $current_branch | cut -f1) if [ -z "$remote_head" ]; then - echo "Branch not pushed to remote, aborting..." >&2 + echo ">>>>>>>>>>>>>>>> Branch not pushed to remote, aborting..." >&2 exit 1 fi if [ "$KAMAL_VERSION" != "$remote_head" ]; then - echo "Version ($KAMAL_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2 + echo ">>>>>>>>>>>>>>>> Version ($KAMAL_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2 exit 1 fi diff --git a/config/deploy.yml b/config/deploy.yml index ee50b93..45ae98a 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -25,7 +25,7 @@ proxy: timeout: 2 # how long to wait for new containers to boot -deploy_timeout: 270 +deploy_timeout: 300 # Credentials for your image host. registry: @@ -47,14 +47,11 @@ builder: # RUBY_VERSION: <%= File.read('.ruby-version').strip %> - -# Inject ENV variables into containers (secrets come from .kamal/secrets). -# -# env: -# clear: -# DB_HOST: 192.168.0.2 -# secret: -# - RAILS_MASTER_KEY +env: + clear: + PORT: 4000 + secret: + - DATABASE_PASSWORD # Aliases are triggered with "bin/kamal ". You can overwrite arguments on invocation: # "bin/kamal logs -r job" will tail logs from the first server in the job section. diff --git a/packages/utils/src/image.spec.ts b/packages/utils/src/image.spec.ts index 0ae64b1..1f47723 100644 --- a/packages/utils/src/image.spec.ts +++ b/packages/utils/src/image.spec.ts @@ -30,7 +30,7 @@ describe('image', function () { describe('getStoryboard', function () { this.timeout(1000*60*15) it('should accept a URL and return a path to image on disk', async function () { - const url = 'http://38.242.193.246:8081/projektmelody-chaturbate-2025-01-11.mp4' + const url = 'http://38.242.193.246:8081/original-20250109T020401Z.mp4' const imagePath = await getStoryboard(url) expect(imagePath).to.match(/\.png/) })