diff options
author | JT <547158+jntrnr@users.noreply.github.com> | 2022-01-25 15:31:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-26 07:31:04 +1100 |
commit | cdc8e67d6198c2178687b9499635c6c4b8fe319c (patch) | |
tree | 5d56abbcdb015eef62e943b78e801f0d4538dc34 /docker | |
parent | 4e8e03867c87307d536369a20dbe81491666ee51 (diff) |
Remove unused repo parts (#4271)
* Remove unused repo parts
* Update README
* cargo fmt
Diffstat (limited to 'docker')
-rw-r--r-- | docker/Dockerfile | 11 | ||||
-rw-r--r-- | docker/Dockerfile.nu-base | 26 | ||||
-rw-r--r-- | docker/Package.Dockerfile | 7 | ||||
-rw-r--r-- | docker/Package.glibc-busybox.Dockerfile | 15 | ||||
-rw-r--r-- | docker/Package.glibc-distroless.Dockerfile | 12 | ||||
-rw-r--r-- | docker/docker-compose.package.yml | 11 | ||||
-rw-r--r-- | docker/packaging/Dockerfile.ubuntu-bionic | 17 | ||||
-rw-r--r-- | docker/packaging/README.md | 55 |
8 files changed, 0 insertions, 154 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 91ad87959..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG FROMTAG=latest -FROM quay.io/nushell/nu-base:${FROMTAG} as base -FROM ubuntu:18.04 -COPY --from=base /usr/local/bin/nu /usr/local/bin/nu -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update \ - && apt-get install -y libssl-dev pkg-config \ - && apt-get clean \ - && rm -fr /var/lib/apt/lists/* -ENTRYPOINT ["nu"] -CMD ["-l", "info"] diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base deleted file mode 100644 index 9a06b38e2..000000000 --- a/docker/Dockerfile.nu-base +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:18.04 - -# docker build -f docker/Dockerfile.nu-base -t nushell/nu-base . -# docker run -it nushell/nu-base - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install -y libssl-dev \ - libxcb-composite0-dev \ - pkg-config \ - libx11-dev \ - curl - -ARG RELEASE=false -WORKDIR /code -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" -ENV PATH=/root/.cargo/bin:$PATH -RUN rustup update -COPY . /code -RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \ - rustc -Vv && \ - if $RELEASE; then cargo build --release; \ - cp target/release/nu /usr/local/bin; \ - else cargo build; \ - cp target/debug/nu /usr/local/bin; fi; -ENTRYPOINT ["nu"] -CMD ["-l", "info"] diff --git a/docker/Package.Dockerfile b/docker/Package.Dockerfile deleted file mode 100644 index a9040d290..000000000 --- a/docker/Package.Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG base -FROM ${base} - -ARG artifact -COPY ${artifact} /bin/ - -ENTRYPOINT ["/bin/nu"]
\ No newline at end of file diff --git a/docker/Package.glibc-busybox.Dockerfile b/docker/Package.glibc-busybox.Dockerfile deleted file mode 100644 index 6191b5f04..000000000 --- a/docker/Package.glibc-busybox.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -ARG base -FROM debian:stable-slim AS patch -FROM ${base} - -ARG artifact -COPY ${artifact} /bin/ - -COPY --from=patch \ - /lib/x86_64-linux-gnu/libz.so.1 \ - /lib/x86_64-linux-gnu/libdl.so.2 \ - /lib/x86_64-linux-gnu/librt.so.1 \ - /lib/x86_64-linux-gnu/libgcc_s.so.1 \ - /lib/x86_64-linux-gnu/ - -ENTRYPOINT ["/bin/nu"]
\ No newline at end of file diff --git a/docker/Package.glibc-distroless.Dockerfile b/docker/Package.glibc-distroless.Dockerfile deleted file mode 100644 index 42768fc08..000000000 --- a/docker/Package.glibc-distroless.Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG base -FROM debian:stable-slim AS patch -FROM ${base} - -ARG artifact -COPY ${artifact} /bin/ - -COPY --from=patch \ - /lib/x86_64-linux-gnu/libz.so.1 \ - /lib/x86_64-linux-gnu/ - -ENTRYPOINT ["/bin/nu"]
\ No newline at end of file diff --git a/docker/docker-compose.package.yml b/docker/docker-compose.package.yml deleted file mode 100644 index a2ad90b6b..000000000 --- a/docker/docker-compose.package.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3' - -services: - nushell: - image: ${DOCKER_REGISTRY}/nu:${DOCKER_TAG} - build: - context: .. - dockerfile: docker/Package${PATCH}.Dockerfile - args: - base: ${BASE_IMAGE} - artifact: ${NU_BINS} diff --git a/docker/packaging/Dockerfile.ubuntu-bionic b/docker/packaging/Dockerfile.ubuntu-bionic deleted file mode 100644 index 574a3b485..000000000 --- a/docker/packaging/Dockerfile.ubuntu-bionic +++ /dev/null @@ -1,17 +0,0 @@ -# docker build -f docker/packaging/Dockerfile.ubuntu-bionic . - -ARG FROMTAG=latest -FROM quay.io/nushell/nu-base:${FROMTAG} - -RUN apt-get update && apt-get install -y \ - devscripts \ - debhelper - -COPY debian /code/debian - -RUN rustc -Vv && cargo build --release && \ - cp README.md debian/README.Debian && \ - debuild -b -us -uc -i && \ - dpkg -i ../nu_0.2.0-1_amd64.deb && \ - chsh -s /usr/bin/nu && \ - echo 'ls | get name ' | /usr/bin/nu
\ No newline at end of file diff --git a/docker/packaging/README.md b/docker/packaging/README.md deleted file mode 100644 index 4990e38b4..000000000 --- a/docker/packaging/README.md +++ /dev/null @@ -1,55 +0,0 @@ -# Packaging - -This directory contains docker images used for creating packages for different distribution. - -## How to use this docker files - -Start with: - -```bash -docker build -f docker/packaging/Dockerfile.ubuntu-bionic -t nushell/package:ubuntu-bionic . -``` - -after building the image please run container: - -```bash -docker run -td --rm --name nushell_package_ubuntu_bionic nushell/package:ubuntu-bionic -``` - -and copy deb package from inside: - -```bash -docker cp nushell_package_ubuntu_bionic:/nu_0.2.0-1_amd64.deb . -``` - -or shell inside, and test install: - -```bash -docker exec -it nushell_package_ubuntu_bionic bash -dpkg -i /nu_0.2.0-1_amd64.deb - -(Reading database ... 25656 files and directories currently installed.) -Preparing to unpack /nu_0.2.0-1_amd64.deb ... -Unpacking nu (0.2.0-1) over (0.2.0-1) ... -Setting up nu (0.2.0-1) ... -``` - -When you are finished, exit and stop the container. It will be removed since we -used `--rm`. - -```bash -docker stop nushell_package_ubuntu_bionic -``` - -## What should be done - -* We should run sbuild command to create chroot and then install dpkg. -For two reasons. First: we want to use the same tools as Ubuntu package builders -to handle the cornercases. Second: we want to test dpkg requirements. -<https://github.com/nushell/nushell/issues/681> - -* File debian/changelog file should be generated based on git history. -<https://github.com/nushell/nushell/issues/682> - -* Building package and nu version should be parametrized. -<https://github.com/nushell/nushell/issues/683> |