Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chmod executables when copying to the docker #17423

Merged
merged 7 commits into from Oct 25, 2021
Merged

chmod executables when copying to the docker #17423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f6d203
chmod executables when copying to the docker
zeripath Oct 24, 2021
8830480
Update Dockerfile
6543 Oct 25, 2021
349709d
Apply suggestions from code review
6543 Oct 25, 2021
2bca566
Merge branch 'main' into fix-17400-add-the-necessary-set-executable
6543 Oct 25, 2021
e603b83
as per review
zeripath Oct 25, 2021
71dce67
Merge remote-tracking branch 'zeripath/fix-17400-add-the-necessary-se…
zeripath Oct 25, 2021
2a092bd
Merge branch 'main' into fix-17400-add-the-necessary-set-executable
zeripath Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Expand Up @@ -66,4 +66,6 @@ CMD ["/bin/s6-svscan", "/etc/s6"]
COPY docker/root /
COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
RUN chmod 755 /usr/bin/entrypoint /app/gitea/gitea /usr/local/bin/environment-to-ini
RUN chmod 755 /etc/s6/gitea/* /etc/s6/openssh/* /etc/s6/.s6-svscan/*
RUN ln -s /app/gitea/gitea /usr/local/bin/gitea
3 changes: 2 additions & 1 deletion Dockerfile.rootless
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ ENV GOPROXY ${GOPROXY:-direct}
ARG GITEA_VERSION
ARG TAGS="sqlite sqlite_unlock_notify"
ENV TAGS "bindata timetzdata $TAGS"
ARG CGO_EXTRA_CFLAGS
ARG CGO_EXTRA_CFLAGS

#Build deps
RUN apk --no-cache add build-base git nodejs npm
Expand Down Expand Up @@ -55,6 +55,7 @@ RUN chown git:git /var/lib/gitea /etc/gitea
COPY docker/rootless /
COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /usr/local/bin/gitea
COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
RUN chmod 755 /usr/local/bin/docker-entrypoint.sh /app/gitea/gitea /usr/local/bin/environment-to-ini /usr/local/bin/docker-setup.sh

#git:git
USER 1000:1000
Expand Down