Skip to content

Commit

Permalink
revert Dockerfile, move two node packages into Earthfile
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerGillson committed Oct 6, 2023
1 parent 6322198 commit 30dd861
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 8 deletions.
21 changes: 13 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
ARG BASE
FROM $BASE

# Install marmot
RUN mkdir -p /opt/spectrocloud/bin && \
curl -sL https://github.com/maxpert/marmot/releases/download/v0.8.6/marmot-v0.8.6-linux-amd64-static.tar.gz | tar -zxv marmot && \
install marmot -o root -g root -m 755 /opt/spectrocloud/bin/ && \
rm -f marmot

# Install sqlite
RUN apt update && apt install -y sqlite3 less
###########################Add any other image customizations here #######################

#### Examples ####

### To install the nginx package for Ubuntu ###

#RUN apt-get update && apt-get install nginx -y

### or

### To install the nginx package for opensuse ###

#RUN zypper refresh && zypper install nginx -y
11 changes: 11 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ARG http_proxy=${HTTP_PROXY}
ARG https_proxy=${HTTPS_PROXY}
ARG PROXY_CERT_PATH
ARG UPDATE_KERNEL=false
ARG TWO_NODE=false

ARG ETCD_VERSION="v3.5.5"

Expand Down Expand Up @@ -247,6 +248,16 @@ base-image:

RUN rm -rf /var/cache/* && \
apt clean

# TODO: handle installation for opensuse
IF $TWO_NODE
RUN mkdir -p /opt/spectrocloud/bin && \
curl -sL https://github.com/maxpert/marmot/releases/download/v0.8.6/marmot-v0.8.6-linux-amd64-static.tar.gz | tar -zxv marmot && \
install marmot -o root -g root -m 755 /opt/spectrocloud/bin/ && \
rm -f marmot
RUN apt install -y sqlite3 less
END
END

# IF OS Type is Opensuse
ELSE IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] && [ "$ARCH" = "amd64" ]
Expand Down

0 comments on commit 30dd861

Please sign in to comment.