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

Jump to bottom

Tidy buildspecs to use container environment #651

Merged
merged 2 commits into from
Jan 15, 2020
Merged

Tidy buildspecs to use container environment #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2e4ac
ci: remove unused environment variable
jahkeup Jan 15, 2020
2f011e0
ci: add systemd headers in image for test stage
jahkeup Jan 15, 2020
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
14 changes: 1 addition & 13 deletions tools/infra/buildspec/thar-develop-pipeline-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
version: 0.2

env:
variables:
# Path to infra tooling directory.
INFRA_DIR: "./tools/infra"

phases:
install:
runtime-versions:
docker: 18
commands:
- . "${INFRA_DIR}/env/lib/environment-setup"
- . setup-rust-builder
# TODO: rely on libsystemd in build container instead, see #545
- apt install -y libsystemd-dev
pre_build:
commands:
- start-build-environment
- environment-report
- write-build-meta
build:
Expand Down
5 changes: 0 additions & 5 deletions tools/infra/buildspec/thar-pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
version: 0.2

env:
variables:
# Path to infra tooling directory.
INFRA_DIR: "./tools/infra"

phases:
pre_build:
commands:
Expand Down
2 changes: 1 addition & 1 deletion tools/infra/container/Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
FROM amazonlinux:2 as base
RUN yum update -y \
&& yum groupinstall -y 'Development Tools' \
&& yum install -y socat procps-ng awscli jq openssh rsync \
&& yum install -y socat procps-ng awscli jq openssh rsync systemd-devel \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good catch

&& amazon-linux-extras enable docker \
&& yum install -y docker amazon-ecr-credential-helper \
&& yum clean all \
Expand Down