[M] Change in docker-playground[master]: open5gs-master: Fix indentation

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email ) Change subject: open5gs-master: Fix indentation ...................................................................... open5gs-master: Fix indentation Use tabs everywhere, as usual with other Dockerfiles (eg. open5gs-latest). Change-Id: Ie4e72f484797ada718915e837cd38be574136631 --- M open5gs-master/Dockerfile 1 file changed, 50 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/09/34709/1 diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index fc88f9e..99def99 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -3,56 +3,56 @@ ARG DISTRO FROM $USER/$DISTRO-build -RUN apt-get update && \ - apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends \ - cmake \ - vim \ - sudo \ - iproute2 \ - iputils-ping \ - libcap2-bin \ - net-tools && \ - apt-get clean +RUN apt-get update && \ + apt-get upgrade -y && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + cmake \ + vim \ + sudo \ + iproute2 \ + iputils-ping \ + libcap2-bin \ + net-tools && \ + apt-get clean # create a user -ARG username=osmocom -RUN useradd -m ${username} && \ - echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ - chmod 0440 /etc/sudoers.d/${username} +ARG username=osmocom +RUN useradd -m ${username} && \ + echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ + chmod 0440 /etc/sudoers.d/${username} -WORKDIR /home/${username} +WORKDIR /home/${username} # clone open5gs -ARG GITHUB_USER=open5gs -ARG GITHUB_REPO=open5gs -ARG OPEN5GS_BRANCH=main -RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO +ARG GITHUB_USER=open5gs +ARG GITHUB_REPO=open5gs +ARG OPEN5GS_BRANCH=main +RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO # install dependencies specified in debian/control (cache them) -RUN cd $GITHUB_REPO && \ - git checkout $OPEN5GS_BRANCH && \ - apt-get build-dep -y . +RUN cd $GITHUB_REPO && \ + git checkout $OPEN5GS_BRANCH && \ + apt-get build-dep -y . -ADD https://api.github.com/repos/$GITHUB_USER/$GITHUB_REPO/git/refs/heads/$OPEN… /root/open5gs-ver.json +ADD https://api.github.com/repos/$GITHUB_USER/$GITHUB_REPO/git/refs/heads/$OPEN… /root/open5gs-ver.json # update the source code (if needed) -RUN cd $GITHUB_REPO && \ - git fetch && git checkout -f -B $OPEN5GS_BRANCH origin/$OPEN5GS_BRANCH +RUN cd $GITHUB_REPO && \ + git fetch && git checkout -f -B $OPEN5GS_BRANCH origin/$OPEN5GS_BRANCH # update installed dependencies, install missing (if any) -RUN cd $GITHUB_REPO && \ - apt-get build-dep -y . +RUN cd $GITHUB_REPO && \ + apt-get build-dep -y . # build + install open5gs -RUN cd $GITHUB_REPO && \ - meson build \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=lib/x86_64-linux-gnu \ - --libexecdir=lib/x86_64-linux-gnu && \ - meson configure build && \ - ninja -C build install +RUN cd $GITHUB_REPO && \ + meson build \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=lib/x86_64-linux-gnu \ + --libexecdir=lib/x86_64-linux-gnu && \ + meson configure build && \ + ninja -C build install -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4e72f484797ada718915e837cd38be574136631 Gerrit-Change-Number: 34709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange