Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfiles moved to root for shared libraries #4071

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Dockerfiles moved to root for shared libraries #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion app_dart/Dockerfile → Dockerfile.app_dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
# Dart Docker official images can be found here: https://hub.docker.com/_/dart
FROM dart:beta@sha256:8f9ccb89e68772720fbedf48baf0f6cc1bf61a6d1fd9962c3a418adbd89bdca0

WORKDIR /cocoon_server

COPY cocoon_server .

WORKDIR /app

# Copy app source code (except anything in .dockerignore).
COPY . .
COPY app_dart .

RUN dart pub get

# Start server.
Expand Down
6 changes: 5 additions & 1 deletion auto_submit/Dockerfile → Dockerfile.auto_submit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
# Dart Docker official images can be found here: https://hub.docker.com/_/dart
FROM dart:beta@sha256:8f9ccb89e68772720fbedf48baf0f6cc1bf61a6d1fd9962c3a418adbd89bdca0

WORKDIR /cocoon_server

COPY cocoon_server .

WORKDIR /app

# Copy app source code (except anything in .dockerignore).
COPY . .
COPY auto_submit .
RUN dart pub get

# Start server.
Expand Down
2 changes: 1 addition & 1 deletion app_dart/cloudbuild_app_dart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ steps:

# Build docker image
- name: 'us-docker.pkg.dev/cloud-builders/ga/v1/docker'
args: ['build', '-t', 'us-docker.pkg.dev/$PROJECT_ID/appengine/default.version-$SHORT_SHA', 'app_dart']
args: ['build', '-t', 'us-docker.pkg.dev/$PROJECT_ID/appengine/default.version-$SHORT_SHA', '-f', 'Dockerfile.app_dart']

# Trigger the cloud build that deploys the docker image
- name: gcr.io/cloud-builders/gcloud
Expand Down
2 changes: 1 addition & 1 deletion auto_submit/cloudbuild_auto_submit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
steps:
# Build docker image
- name: 'us-docker.pkg.dev/cloud-builders/ga/v1/docker'
args: ['build', '-t', 'us-docker.pkg.dev/$PROJECT_ID/appengine/auto-submit.version-$SHORT_SHA', 'auto_submit']
args: ['build', '-t', 'us-docker.pkg.dev/$PROJECT_ID/appengine/auto-submit.version-$SHORT_SHA', '-f', 'Dockerfile.auto_submit']

# Trigger the cloud build that deploys the docker image
- name: gcr.io/cloud-builders/gcloud
Expand Down