Skip to content

Commit

Permalink
Merge pull request #26 from jsfillman/DEVOPS-1770-GCloudUpdates
Browse files Browse the repository at this point in the history
Devops 1770 g cloud updates
  • Loading branch information
jsfillman authored Mar 30, 2024
2 parents 2aaa08c + 62ff6a6 commit 1373122
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 25 deletions.
32 changes: 8 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,16 @@
FROM arangodb:3.5.3
FROM alpine:latest

# Build arguments passed into the docker command for image metadata
ARG BUILD_DATE
ARG COMMIT
ARG BRANCH

# RUN pip install requests docker python-json-logger structlog && \
# Update and install necessary packages
RUN apk update && \
apk add p7zip && \
cd /tmp && \
wget https://downloads.rclone.org/rclone-current-linux-amd64.zip && \
unzip rclone-current-linux-amd64.zip && \
mv rclone-v*-linux-amd64/rclone /bin/rclone && \
mkdir -p /root/.config/rclone/
apk add p7zip rclone

# Create config directory
RUN mkdir -p /root/.config/rclone/

# Copy necessary files
COPY rclone.conf /root/.config/rclone/rclone.conf
COPY app/ /app/

LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-url="https://github.com/kbase/db_zip2cloud.git" \
org.label-schema.vcs-ref=$COMMIT \
org.label-schema.schema-version="1.0.0-rc1" \
us.kbase.vcs-branch=$BRANCH \
maintainer="Steve Chan [email protected]" \
org.opencontainers.image.source="https://github.com/kbase/db_zip2cloud"

WORKDIR /app

ENTRYPOINT /app/zip2cloud


ENTRYPOINT /app/zip2cloud
2 changes: 1 addition & 1 deletion app/zip2cloud
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ done
cd ${ZIP_DIR}
for file in ${ZIP_DIR}/*; do
echo "RClone-ing ${file} to GCP ${GCP_DEST}"
/bin/rclone sync -v "$file" ${REMOTE}
/bin/rclone sync -v "$file" ${REMOTE}/
done

## Create a block that, upon success of rclone above, delete _only_ files that were uploaded
Expand Down

0 comments on commit 1373122

Please sign in to comment.