Skip to content

Commit

Permalink
jfrogGH-621 - Jobs done. No support no docker v2. Docker file for con…
Browse files Browse the repository at this point in the history
…tainering this script isn't done, but it's also out-of-scope
  • Loading branch information
chb0github committed Oct 2, 2023
1 parent bd61ddb commit 126cf7d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ WORKDIR /home/jfrog
COPY --from=builder /src/terraform-provider-artifactory/v5-v6-migrator/tf-v5-migrator /home/jfrog/tf-v5-migrator

FROM alpine as importer
RUN apk add --no-cache jq curl bash
RUN apk add --no-cache jq curl bash terraform
RUN adduser -S jfrog
WORKDIR /home/jfrog
COPY scripts/bulkimport.sh /home/jfrog
RUN chown -R jfrog /home/jfrog
USER jfrog
COPY scripts/bulkimport.sh .
ENTRYPOINT ./bulkimport.sh
ENTRYPOINT bash
CMD /home/jfrog/bulkimport.sh
2 changes: 1 addition & 1 deletion scripts/bulkimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function write_netrc {
}

# if they have no netrc file at all, create the file and add an entry
if ! hasNetRcEntry "${host}" ; then
if ! hasNetRcEntry "${host:?Host not defined}" ; then
cat <<-EOF >&2
added entry
Expand Down

0 comments on commit 126cf7d

Please sign in to comment.