Skip to content

Commit

Permalink
🎨 Minor Earthfile fixups
Browse files Browse the repository at this point in the history
drop defaults from OSRELEASE, default OS_LABEL with latest
  • Loading branch information
mudler committed Aug 18, 2022
1 parent 91bbe78 commit b2b81bf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ OSRELEASE:
ARG OS_LABEL
ARG VARIANT
ARG FLAVOR
ARG GITHUB_REPO=c3os-io/c3os
ARG BUG_REPORT_URL=https://github.com/c3os-io/c3os/issues
ARG HOME_URL=https://github.com/c3os-io/c3os
ARG GITHUB_REPO
ARG BUG_REPORT_URL
ARG HOME_URL
ENV OS_ID=$OS_ID
ENV OS_NAME=$OS_NAME
ENV OS_REPO=$OS_REPO
Expand Down Expand Up @@ -229,12 +229,12 @@ docker:
ARG OS_ID
ARG OS_NAME=${OS_ID}-${VARIANT}-${FLAVOR}
ARG OS_REPO=quay.io/c3os/${VARIANT}-${FLAVOR}
ARG OS_LABEL=${FLAVOR}-latest
ARG OS_LABEL=latest

# Includes overlay/files
COPY +framework/framework /

DO +OSRELEASE --VARIANT=${VARIANT} --FLAVOR=${FLAVOR} --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}
DO +OSRELEASE --HOME_URL=https://github.com/c3os-io/c3os --BUG_REPORT_URL=https://github.com/c3os-io/c3os/issues --GITHUB_REPO=c3os-io/c3os --VARIANT=${VARIANT} --FLAVOR=${FLAVOR} --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}

RUN rm -rf /etc/machine-id && touch /etc/machine-id && chmod 444 /etc/machine-id

Expand Down

0 comments on commit b2b81bf

Please sign in to comment.