Skip to content

Commit 5120ff8

Browse files
authored
Merge pull request #278 from swamphacks/master
sync hotfixes
2 parents e425159 + 2310a1c commit 5120ff8

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/deploy-caddy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
script: |
2323
cd /root/core/infra
2424
git fetch
25-
git checkout dev
26-
git reset --hard origin/dev
25+
git checkout master
26+
git reset --hard origin/master
2727
git pull
2828
2929
export INFISICAL_TOKEN=$(infisical login \
@@ -35,11 +35,11 @@ jobs:
3535
3636
infisical export \
3737
--token=$INFISICAL_TOKEN \
38-
--env=dev \
38+
--env=master \
3939
--format=dotenv \
4040
--path="/api" \
4141
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
42-
> ./secrets/.env.dev.api
42+
> ./secrets/.env.api
4343
4444
docker compose -f docker-compose.api.yml pull caddy
4545
docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate caddy

apps/api/cmd/BAT_worker/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ func main() {
5656
},
5757
)
5858

59+
logger.Info().Msg("Debug test")
60+
5961
schedulerLocation, err := time.LoadLocation("America/New_York")
6062
if err != nil {
6163
panic(err)

infra/Caddyfile.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dev-asynqmon.swamphacks.com {
7575
# Production Asynqmon
7676

7777
asynqmon.swamphacks.com {
78-
reverse_proxy asynqmon-dev:6767 {
78+
reverse_proxy asynqmon:6767 {
7979
header_up X-Real-IP {remote}
8080
header_up X-Forwarded-For {remote}
8181
header_up X-Forwarded-Port {server_port}

infra/docker-compose.api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ services:
140140
- REDIS_ADDR=redis:6379
141141
- PORT=6767
142142
depends_on:
143-
- redis-dev
143+
- redis
144144

145145

146146
volumes:

0 commit comments

Comments
 (0)