Skip to content
This repository has been archived by the owner on Jan 9, 2024. It is now read-only.

chore(deps): update localstack/localstack docker digest to 97b91ae #729

Merged
merged 3 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
TZ: 'UTC'
- image: localstack/localstack@sha256:85ef00e0eff182b425a8b179e14a1cb026c5727e2a5c77777497042c8e352933
- image: localstack/localstack@sha256:9e672725b3937f55b69c5c6afe3311d3ac034aab753633ceb2779a1efbba5c7d
auth:
username: $DOCKERHUB_USERNAME
password: $DOCKERHUB_PASSWORD
Expand Down
7 changes: 0 additions & 7 deletions .docker/localstack/events.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .docker/localstack/firehose.sh
100644 β†’ 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -x
set -euo pipefail

STREAMS=('dev-user-action-to-braveheart')

Expand Down
2 changes: 1 addition & 1 deletion .docker/localstack/kinesis.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -x
set -euo pipefail

STREAMS=('analytics.user_action' 'analytics.web_track' 'unified_event' 'raw_event')

Expand Down
2 changes: 1 addition & 1 deletion .docker/localstack/sqs.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -x
set -euo pipefail

SQS=(
pocket-publisher-data-queue
Expand Down
64 changes: 38 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,43 @@
version: '3.1'
version: '3.8'

services:
mysql:
image: mysql:5.6@sha256:20575ecebe6216036d25dab5903808211f1e9ba63dc7825ac20cb975e34cfcae
platform: linux/amd64
env_file:
- ./.docker/local.env
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: true
TZ: "US/Central"
healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
timeout: 20s
retries: 10
platform: linux/amd64
ports:
- '3309:3306'
volumes:
- .docker/mysql/schema:/docker-entrypoint-initdb.d:delegated
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- TZ=US/Central

localstack:
image: localstack/localstack:1.3@sha256:74b94340e37c820cfd523333ee8ce8abf07fceced8c201c7db76eb1cba0b9099
image: localstack/localstack@sha256:9e672725b3937f55b69c5c6afe3311d3ac034aab753633ceb2779a1efbba5c7d
env_file:
- .docker/local.env
environment:
LOCALSTACK_HOST: localstack
SERVICES: "kinesis,firehose,sqs,events"
healthcheck:
test:
- CMD
- bash
- -c
- curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:4566/_localstack/health
interval: 5s
timeout: 10s
start_period: 10s
ports:
- '4566:4566'
volumes:
- /etc/localstack/init/ready.d
environment:
- LOCALSTACK_API_KEY=${LOCALSTACK_API_KEY}
- DEBUG=1
- SERVICES=kinesis,firehose,sqs,events
- PERSISTENCE=1
- DOCKER_HOST=unix:///var/run/docker.sock
- EXTRA_CORS_ALLOWED_HEADERS=Content-Disposition, Content-Type, x-amz-acl
- EXTRA_CORS_EXPOSE_HEADERS=ETag
- HOSTNAME_EXTERNAL=localstack
- ./.docker/localstack:/etc/localstack/init/ready.d

otlpcollector:
image: amazon/aws-otel-collector@sha256:1addb52aaf4880455aaabcc934924d735212d95e81f5a5fa44ee6a61fa03b8f1
Expand All @@ -40,6 +48,12 @@ services:
- '4137:4137'
- '4138:4138'

snowplow:
image: pocket/snowplow-micro:prod
platform: linux/amd64
ports:
- '9090:9090'

app:
image: node:16@sha256:550f484fc5f314b575f5e397c9e2c71d7f218e59729fcda9ffa7ea1fc825dce7
platform: linux/amd64
Expand All @@ -56,13 +70,11 @@ services:
- TZ=US/Central
entrypoint: ./.docker/scripts/local-start.sh
depends_on:
- mysql
- localstack
- snowplow
- otlpcollector

snowplow:
image: pocket/snowplow-micro:prod
platform: linux/amd64
ports:
- '9090:9090'
localstack:
condition: service_healthy
mysql:
condition: service_healthy
otlpcollector:
condition: service_started
snowplow:
condition: service_started
6 changes: 3 additions & 3 deletions src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ export default {
events: Object.values(EventType) as string[],
url:
process.env.SQS_PUBLISHER_DATA_QUEUE_URL ||
'http://localhost:4566/queue/pocket-publisher-data-queue',
'http://localhost:4566/000000000000/pocket-publisher-data-queue',
},
listDeleteQueue: {
url:
process.env.SQS_BATCH_DELETE_QUEUE_URL ||
'http://localhost:4566/queue/pocket-list-delete-queue',
'http://localhost:4566/000000000000/pocket-list-delete-queue',
visibilityTimeout: 10000,
messageRetentionSeconds: 1209600,
maxMessages: 1,
Expand All @@ -55,7 +55,7 @@ export default {
events: [EventType.ADD_ITEM],
url:
process.env.SQS_PERMLIB_ITEMMAIN_QUEUE_URL ||
'http://localhost:4566/queue/PermLib-Local-ItemMain',
'http://localhost:4566/000000000000/PermLib-Local-ItemMain',
},
waitTimeSeconds: 20,
batchSize: 10,
Expand Down