Skip to content

Commit 3abc87d

Browse files
committed
changes
1 parent 571f812 commit 3abc87d

File tree

5 files changed

+2
-32
lines changed

5 files changed

+2
-32
lines changed

frontend/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ COPY --from=deps /app/node_modules ./node_modules
2525
COPY . .
2626

2727
RUN corepack enable pnpm
28-
RUN --mount=type=secret,id=sentry_auth_token,env=SENTRY_AUTH_TOKEN \
29-
pnpm run build
28+
RUN pnpm run build
3029

3130
FROM base AS runner
3231
WORKDIR /app

infrastructure/applications/pretix/ecr.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
data "aws_ecr_repository" "repo" {
2-
name = "pythonit/pretix"
3-
}
4-
5-
data "aws_ecr_image" "image" {
6-
repository_name = data.aws_ecr_repository.repo.name
7-
image_tag = "arm-${data.external.githash.result.githash}"
8-
}
9-
10-
data "aws_caller_identity" "current" {}
11-
121
data "external" "githash" {
132
program = ["python", abspath("${path.module}/githash.py")]
143
working_dir = abspath("${path.root}/../../pretix")

infrastructure/applications/pycon_backend/worker_heavy_processing.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ resource "aws_ecs_task_definition" "heavy_processing_worker" {
1919
container_definitions = jsonencode([
2020
{
2121
name = "worker"
22-
image = "${data.aws_ecr_repository.be_repo.repository_url}@${data.aws_ecr_image.be_arm_image.image_digest}"
22+
image = local.image
2323
memoryReservation = 16384
2424
essential = true
2525
entrypoint = [

infrastructure/applications/pycon_backend/worker_repo.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
data "aws_ecr_repository" "be_repo" {
2-
name = "pythonit/pycon-backend"
3-
}
4-
5-
data "aws_ecr_image" "be_arm_image" {
6-
repository_name = data.aws_ecr_repository.be_repo.name
7-
image_tag = "arm-${data.external.githash.result.githash}"
8-
}
9-
10-
data "aws_caller_identity" "current" {}
11-
121
data "external" "githash" {
132
program = ["python", abspath("${path.module}/../pretix/githash.py")]
143
working_dir = abspath("${path.root}/../../backend")

infrastructure/applications/pycon_frontend/repo.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ resource "aws_ecr_repository" "repo" {
22
name = "pythonit/${terraform.workspace}-pycon-frontend"
33
}
44

5-
data "aws_ecr_image" "image" {
6-
repository_name = aws_ecr_repository.repo.name
7-
image_tag = data.external.githash.result.githash
8-
}
9-
10-
data "aws_caller_identity" "current" {}
11-
125
data "external" "githash" {
136
program = ["python", abspath("${path.module}/../pretix/githash.py")]
147
working_dir = abspath("${path.root}/../../frontend")

0 commit comments

Comments
 (0)