Skip to content

Commit

Permalink
chore: dockerfiles/che -> build/dockerfiles (eclipse-che/che-server#573)
Browse files Browse the repository at this point in the history
Change-Id: I4daaec4ad95e40a87b553150b914d826165dcf0f
Signed-off-by: Nick Boldt <nboldt@redhat.com>
  • Loading branch information
nickboldt committed Nov 14, 2023
1 parent a767d94 commit c4ef7d3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions devspaces-server/build/scripts/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ rsync -azrlt --checksum --exclude-from /tmp/rsync-excludes --delete ${SOURCEDIR}
rm -f /tmp/rsync-excludes

# copy entrypoint.sh
rsync -azrlt --checksum ${SOURCEDIR}/dockerfiles/che/entrypoint.sh ${TARGETDIR}
rsync -azrlt --checksum ${SOURCEDIR}/build/dockerfiles/entrypoint.sh ${TARGETDIR}

# ensure shell scripts are executable
find ${TARGETDIR}/ -name "*.sh" -exec chmod +x {} \;
Expand Down Expand Up @@ -166,7 +166,7 @@ fi
generateFetchArtifactsPNCYaml

# NOTE: upstream Dockerfile is in non-standard path (not build/dockerfiles/Dockerfile) because project has multiple container builds
sed ${SOURCEDIR}/dockerfiles/che/Dockerfile -r \
sed ${SOURCEDIR}/build/dockerfiles/Dockerfile -r \
-e 's@/home/user/eclipse-che@/home/user/devspaces@g' \
`# insert logic to unpack asset-*.tgz` \
-e 's@ADD eclipse-che .+@# see fetch-artifacts-pnc.yaml\nCOPY artifacts/assembly-main.tar.gz /tmp/assembly-main.tar.gz\nRUN tar xzf /tmp/assembly-main.tar.gz --strip-components=1 -C /home/user/devspaces; rm -f /tmp/assembly-main.tar.gz\n@g' \
Expand Down

0 comments on commit c4ef7d3

Please sign in to comment.