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.

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

fix(shallow-server): remove fuse-overlayfs workarounds #641

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions shallow-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ COPY opcache-recommended.ini /usr/local/etc/php/conf.d/

WORKDIR /var/www/html

# Looks like there's an issue on self-hosted runners with fuse-overlayfs that prevents us deleting the directory directly
# so rename it first and then remove it
RUN mv /var/www/html/ /var/www/html2/ && rm -rf /var/www/html2/
RUN rm -rf /var/www/html
RUN mkdir -p /var/www/html
RUN chown www-data:www-data .

Expand Down
5 changes: 0 additions & 5 deletions shallow-server/initnc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ export BRANCH=${BRANCH:=master}
# Where we do all the work
cd /var/www/html/

# Run 'apt-get update' to unlock files. This seems neccessary on self hosted runners with fuse-overlayfs,
# otherwise git checkout will error out with 'file exists' error. Needs to be run here, doesn't work when
# done inside the Dockerfile
apt-get update

# Update code
su www-data -c "
git fetch --force --depth 1 origin $BRANCH:refs/remotes/origin/$BRANCH
Expand Down
Loading