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

agorictest-6 deployment fixes #2493

Merged
merged 4 commits into from
Feb 21, 2021
Merged

agorictest-6 deployment fixes #2493

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2fed3b
fix: remove journalbeat from build; it fails and we don't use it
michaelfig Feb 17, 2021
8afd58b
fix: properly docker push agoric/deployment:$(TAG)
michaelfig Feb 17, 2021
db75f65
fix: be tolerant of delegation errors
michaelfig Feb 19, 2021
7e45aa4
feat: bump to cosmos-sdk v0.41.1
michaelfig Feb 21, 2021
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
15 changes: 9 additions & 6 deletions packages/deployment/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
ARG TAG=latest
ARG REPO=agoric/agoric-sdk
FROM golang:buster AS go-build

WORKDIR /usr/src/journalbeat
RUN apt-get update -y && apt-get install -y libsystemd-dev
RUN go get github.com/mheese/journalbeat
# FIXME: Journalbeat compilation is currently broken, but non-essential.
Copy link
Member

Choose a reason for hiding this comment

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

We eventually do want to use journalbeat? That's why the FIXME and the commented rather than deleted code?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, just paranoia. I'll delete the code.

# Removed from the build.
# FROM golang:buster AS go-build

# WORKDIR /usr/src/journalbeat
# RUN apt-get update -y && apt-get install -y libsystemd-dev
# RUN go get github.com/mheese/journalbeat

FROM $REPO:$TAG

Expand All @@ -20,8 +23,8 @@ RUN echo 'deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main' >> /e
apt-get install -y ansible rsync curl sudo gnupg2 jq python-jmespath && \
apt-get clean -y

# Copy journalbeat for logging support
COPY --from=go-build /go/bin/journalbeat /usr/local/bin/
# # Copy journalbeat for logging support
# COPY --from=go-build /go/bin/journalbeat /usr/local/bin/

WORKDIR /usr/src/app
RUN ln -sf $PWD/setup/ag-setup-cosmos /usr/local/bin/
Expand Down