Commit 9ecfc39b by Leonard Gram

build: fixes the path for gsutil and gcloud.

parent 7c22848c
...@@ -8,8 +8,6 @@ RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-de ...@@ -8,8 +8,6 @@ RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-de
FROM circleci/python:2.7-stretch FROM circleci/python:2.7-stretch
ENV PATH=$PATH:/opt/google-cloud-sdk/bin
USER root USER root
RUN pip install awscli && \ RUN pip install awscli && \
...@@ -18,7 +16,9 @@ RUN pip install awscli && \ ...@@ -18,7 +16,9 @@ RUN pip install awscli && \
apt update && \ apt update && \
apt install -y createrepo expect && \ apt install -y createrepo expect && \
apt-get autoremove -y && \ apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/* && \
ln -s /opt/google-cloud-sdk/bin/gsutil /usr/bin/gsutil && \
ln -s /opt/google-cloud-sdk/bin/gcloud /usr/bin/gcloud
COPY --from=0 /go/bin/aptly /usr/local/bin/aptly COPY --from=0 /go/bin/aptly /usr/local/bin/aptly
......
#!/bin/bash #!/bin/bash
_version="1.1.0" _version="1.2.0"
_tag="grafana/grafana-ci-deploy:${_version}" _tag="grafana/grafana-ci-deploy:${_version}"
docker build -t $_tag . docker build -t $_tag .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment