From cdc8e67d6198c2178687b9499635c6c4b8fe319c Mon Sep 17 00:00:00 2001 From: JT <547158+jntrnr@users.noreply.github.com> Date: Tue, 25 Jan 2022 15:31:04 -0500 Subject: [PATCH] Remove unused repo parts (#4271) * Remove unused repo parts * Update README * cargo fmt --- .circleci/config.yml | 165 ------------------ .dockerignore | 1 - .gitpod.Dockerfile | 18 -- .gitpod.yml | 25 --- .theia/launch.json | 14 -- .theia/tasks.json | 12 -- README.md | 15 +- .../nu-command/src/commands/filters/insert.rs | 4 +- .../nu-command/src/commands/filters/update.rs | 4 +- .../nu-command/src/commands/filters/zip_.rs | 9 +- crates/nu-protocol/src/value.rs | 4 +- crates/nu_plugin_inc/src/nu/mod.rs | 4 +- debian/changelog | 5 - debian/compat | 1 - debian/control | 18 -- debian/copyright | 32 ---- debian/install | 11 -- debian/postinst | 8 - debian/postrm | 17 -- debian/rules | 25 --- debian/source/format | 1 - docker/Dockerfile | 11 -- docker/Dockerfile.nu-base | 26 --- docker/Package.Dockerfile | 7 - docker/Package.glibc-busybox.Dockerfile | 15 -- docker/Package.glibc-distroless.Dockerfile | 12 -- docker/docker-compose.package.yml | 11 -- docker/packaging/Dockerfile.ubuntu-bionic | 17 -- docker/packaging/README.md | 55 ------ 29 files changed, 11 insertions(+), 536 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .dockerignore delete mode 100644 .gitpod.Dockerfile delete mode 100644 .gitpod.yml delete mode 100644 .theia/launch.json delete mode 100644 .theia/tasks.json delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/install delete mode 100644 debian/postinst delete mode 100644 debian/postrm delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 docker/Dockerfile delete mode 100644 docker/Dockerfile.nu-base delete mode 100644 docker/Package.Dockerfile delete mode 100644 docker/Package.glibc-busybox.Dockerfile delete mode 100644 docker/Package.glibc-distroless.Dockerfile delete mode 100644 docker/docker-compose.package.yml delete mode 100644 docker/packaging/Dockerfile.ubuntu-bionic delete mode 100644 docker/packaging/README.md diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 35ab3f59a5..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,165 +0,0 @@ -# CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/configuration-reference/ for more details -# See https://circleci.com/docs/2.0/config-intro/#section=configuration for spec -# -version: 2.1 - -# Commands - -commands: - - pull_cache: - description: Pulls Quay.io docker images (latest) for our cache - parameters: - tag: - type: string - default: "devel" - steps: - - run: echo "Tag is << parameters.tag >>" - - run: docker pull quay.io/nushell/nu:<< parameters.tag >> - - run: docker pull quay.io/nushell/nu-base:<< parameters.tag >> - -orbs: - # https://circleci.com/orbs/registry/orb/circleci/docker - docker: circleci/docker@0.5.13 - -workflows: - version: 2.0 - - # This builds on all pull requests to test, and ignores main - build_without_deploy: - jobs: - - docker/publish: - deploy: false - image: nushell/nu-base - tag: latest - dockerfile: docker/Dockerfile.nu-base - extra_build_args: --cache-from=quay.io/nushell/nu-base:devel - filters: - branches: - ignore: - - main - before_build: - - pull_cache - after_build: - - run: - name: Build Multistage (smaller) container - command: | - docker build -f docker/Dockerfile -t quay.io/nushell/nu . - - run: - name: Preview Docker Tag for Nushell Build - command: | - DOCKER_TAG=$(docker run quay.io/nushell/nu --version | cut -d' ' -f2) - echo "Version that would be used for Docker tag is v${DOCKER_TAG}" - - run: - name: Test Executable - command: | - docker run --rm quay.io/nushell/nu-base --help - docker run --rm quay.io/nushell/nu --help - - # workflow publishes to Docker Hub, with each job having different triggers - build_with_deploy: - jobs: - - # Deploy versioned and latest images on tags (releases) only - builds --release. - - docker/publish: - image: nushell/nu-base - registry: quay.io - tag: latest - dockerfile: docker/Dockerfile.nu-base - extra_build_args: --cache-from=quay.io/nushell/nu-base:latest,quay.io/nushell/nu:latest --build-arg RELEASE=true - filters: - branches: - ignore: /.*/ - tags: - only: /^\d+\.\d+\.\d+$/ - before_build: - - run: docker pull quay.io/nushell/nu:latest - - run: docker pull quay.io/nushell/nu-base:latest - after_build: - - run: - name: Build Multistage (smaller) container - command: | - docker build -f docker/Dockerfile -t quay.io/nushell/nu . - - run: - name: Test Executable - command: | - docker run --rm quay.io/nushell/nu --help - docker run --rm quay.io/nushell/nu-base --help - - run: - name: Publish Docker Tag with Nushell Version - command: | - DOCKER_TAG=$(docker run quay.io/nushell/nu --version | cut -d' ' -f2) - echo "Version for Docker tag is ${DOCKER_TAG}" - docker tag quay.io/nushell/nu-base:latest quay.io/nushell/nu-base:${DOCKER_TAG} - docker tag quay.io/nushell/nu:latest quay.io/nushell/nu:${DOCKER_TAG} - docker push quay.io/nushell/nu-base - docker push quay.io/nushell/nu - - - # publish devel to Docker Hub on merge to main (doesn't build --release) - build_with_deploy_devel: - jobs: - - # Deploy devel tag on merge to main - - docker/publish: - image: nushell/nu-base - registry: quay.io - tag: devel - dockerfile: docker/Dockerfile.nu-base - extra_build_args: --cache-from=quay.io/nushell/nu-base:devel - before_build: - - pull_cache - filters: - branches: - only: main - after_build: - - run: - name: Build Multistage (smaller) container - command: | - docker build --build-arg FROMTAG=devel -f docker/Dockerfile -t quay.io/nushell/nu:devel . - - run: - name: Test Executable - command: | - docker run --rm quay.io/nushell/nu:devel --help - docker run --rm quay.io/nushell/nu-base:devel --help - - run: - name: Publish Development Docker Tags - command: | - docker push quay.io/nushell/nu-base:devel - docker push quay.io/nushell/nu:devel - - nightly: - triggers: - - schedule: - cron: "0 0 * * *" - filters: - branches: - only: - - main - jobs: - - docker/publish: - image: nushell/nu-base - registry: quay.io - tag: nightly - dockerfile: docker/Dockerfile.nu-base - extra_build_args: --cache-from=quay.io/nushell/nu-base:nightly --build-arg RELEASE=true - before_build: - - run: docker pull quay.io/nushell/nu:nightly - - run: docker pull quay.io/nushell/nu-base:nightly - after_build: - - run: - name: Build Multistage (smaller) container - command: | - docker build -f docker/Dockerfile -t quay.io/nushell/nu:nightly . - - run: - name: Test Executable - command: | - docker run --rm quay.io/nushell/nu:nightly --help - docker run --rm quay.io/nushell/nu-base:nightly --help - - run: - name: Publish Nightly Nushell Containers - command: | - docker push quay.io/nushell/nu-base:nightly - docker push quay.io/nushell/nu:nightly diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index eb5a316cbd..0000000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile deleted file mode 100644 index 36ebb42787..0000000000 --- a/.gitpod.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM gitpod/workspace-full - -# Gitpod will not rebuild Nushell's dev image unless *some* change is made to this Dockerfile. -# To force a rebuild, simply increase this counter: -ENV TRIGGER_REBUILD 2 - -USER gitpod - -RUN sudo apt-get update && \ - sudo apt-get install -y \ - libssl-dev \ - libxcb-composite0-dev \ - pkg-config \ - libpython3.6 \ - rust-lldb \ - && sudo rm -rf /var/lib/apt/lists/* - -ENV RUST_LLDB=/usr/bin/lldb-11 diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index b87ab1b04d..0000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,25 +0,0 @@ -image: - file: .gitpod.Dockerfile -tasks: - - name: Clippy - init: cargo clippy --all --features=stable -- -D clippy::result_unwrap_used -D clippy::option_unwrap_used - - name: Testing - init: cargo test --all --features=stable - - name: Build - init: cargo build --features=stable - - name: Nu - init: cargo install --path . --features=stable - command: nu -github: - prebuilds: - branches: true - pullRequestsFromForks: true - addLabel: prebuilt-in-gitpod -vscode: - extensions: - - hbenl.vscode-test-explorer@2.15.0:koqDUMWDPJzELp/hdS/lWw== - - Swellaby.vscode-rust-test-adapter@0.11.0:Xg+YeZZQiVpVUsIkH+uiiw== - - serayuzgur.crates@0.4.7:HMkoguLcXp9M3ud7ac3eIw== - - belfz.search-crates-io@1.2.1:kSLnyrOhXtYPjQpKnMr4eQ== - - bungcip.better-toml@0.3.2:3QfgGxxYtGHfJKQU7H0nEw== - - webfreak.debug@0.24.0:1zVcRsAhewYEX3/A9xjMNw== diff --git a/.theia/launch.json b/.theia/launch.json deleted file mode 100644 index e89436a486..0000000000 --- a/.theia/launch.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "type": "gdb", - "request": "launch", - "name": "Debug Rust Code", - "preLaunchTask": "cargo", - "target": "${workspaceFolder}/target/debug/nu", - "cwd": "${workspaceFolder}", - "valuesFormatting": "parseText" - } - ] -} diff --git a/.theia/tasks.json b/.theia/tasks.json deleted file mode 100644 index ea0f23fcf0..0000000000 --- a/.theia/tasks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "tasks": [ - { - "command": "cargo", - "args": [ - "build" - ], - "type": "process", - "label": "cargo", - } - ], -} diff --git a/README.md b/README.md index b05086e299..ea2da1fb1d 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,6 @@ We also have an active [Discord](https://discord.gg/NtAbbGn) and [Twitter](https You can also find information on more specific topics in our [cookbook](https://www.nushell.sh/cookbook/). -Try it in Gitpod. - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/nushell/nushell) - ## Installation ### Local @@ -113,12 +109,11 @@ Commands are separated by the pipe symbol (`|`) to denote a pipeline flowing lef 0 │ assets │ Dir │ 128 B │ 5 months ago 1 │ crates │ Dir │ 704 B │ 50 mins ago 2 │ debian │ Dir │ 352 B │ 5 months ago - 3 │ docker │ Dir │ 288 B │ 3 months ago - 4 │ docs │ Dir │ 192 B │ 50 mins ago - 5 │ images │ Dir │ 160 B │ 5 months ago - 6 │ src │ Dir │ 128 B │ 1 day ago - 7 │ target │ Dir │ 160 B │ 5 days ago - 8 │ tests │ Dir │ 192 B │ 3 months ago + 3 │ docs │ Dir │ 192 B │ 50 mins ago + 4 │ images │ Dir │ 160 B │ 5 months ago + 5 │ src │ Dir │ 128 B │ 1 day ago + 6 │ target │ Dir │ 160 B │ 5 days ago + 7 │ tests │ Dir │ 192 B │ 3 months ago ───┴────────┴──────┴───────┴────────────── ``` diff --git a/crates/nu-command/src/commands/filters/insert.rs b/crates/nu-command/src/commands/filters/insert.rs index 2cbcef5917..d3399bb18d 100644 --- a/crates/nu-command/src/commands/filters/insert.rs +++ b/crates/nu-command/src/commands/filters/insert.rs @@ -112,9 +112,7 @@ fn process_row( }; match input { - obj - @ - Value { + obj @ Value { value: UntaggedValue::Row(_), .. } => match obj.insert_data_at_column_path(&field, result) { diff --git a/crates/nu-command/src/commands/filters/update.rs b/crates/nu-command/src/commands/filters/update.rs index 6a63beef5f..a3bf26a90e 100644 --- a/crates/nu-command/src/commands/filters/update.rs +++ b/crates/nu-command/src/commands/filters/update.rs @@ -117,9 +117,7 @@ fn process_row( }; match input { - obj - @ - Value { + obj @ Value { value: UntaggedValue::Row(_), .. } => match obj.replace_data_at_column_path(&field, result) { diff --git a/crates/nu-command/src/commands/filters/zip_.rs b/crates/nu-command/src/commands/filters/zip_.rs index 5757ec15e7..8ce5af6dca 100644 --- a/crates/nu-command/src/commands/filters/zip_.rs +++ b/crates/nu-command/src/commands/filters/zip_.rs @@ -86,16 +86,11 @@ fn zip<'a>( ) -> Result + 'a + Sync + Send>, ShellError> { Ok(Box::new(l.zip(r?).map(move |(s1, s2)| match (s1, s2) { ( - left_row - @ - Value { + left_row @ Value { value: UntaggedValue::Row(_), .. }, - mut - right_row - @ - Value { + mut right_row @ Value { value: UntaggedValue::Row(_), .. }, diff --git a/crates/nu-protocol/src/value.rs b/crates/nu-protocol/src/value.rs index cc8e62caea..a4df026085 100644 --- a/crates/nu-protocol/src/value.rs +++ b/crates/nu-protocol/src/value.rs @@ -573,9 +573,7 @@ impl Value { value: UntaggedValue::Table(rows), .. } => rows.is_empty(), - r - @ - Value { + r @ Value { value: UntaggedValue::Row(_), .. } => r.row_entries().all(|(_, value)| value.is_empty()), diff --git a/crates/nu_plugin_inc/src/nu/mod.rs b/crates/nu_plugin_inc/src/nu/mod.rs index 988cd21223..b7c48fbd5f 100644 --- a/crates/nu_plugin_inc/src/nu/mod.rs +++ b/crates/nu_plugin_inc/src/nu/mod.rs @@ -49,9 +49,7 @@ impl Plugin for Inc { if let Some(args) = call_info.args.positional { for arg in args { match arg { - table - @ - Value { + table @ Value { value: UntaggedValue::Primitive(Primitive::ColumnPath(_)), .. } => { diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index d6f8273939..0000000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -nu (0.2.0-1) unstable; urgency=low - - * Initial release - - -- Jan Koprowski Wed, 04 Sep 2019 21:38:44 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b8a..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control deleted file mode 100644 index 50c156c8da..0000000000 --- a/debian/control +++ /dev/null @@ -1,18 +0,0 @@ -Source: nu -Section: shells -Priority: optional -Maintainer: Jan Koprowski -Build-Depends: debhelper (>= 10) -Standards-Version: 4.1.2 -Homepage: https://github.com/nushell/nushell -Vcs-Git: https://github.com/nushell/nushell.git -Vcs-Browser: https://github.com/nushell/nushell - -Package: nu -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A modern shell for the GitHub era - The goal of this project is to take the Unix - philosophy of shells, where pipes connect simple - commands together, and bring it to the modern - style of development. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 81ce9e5e34..0000000000 --- a/debian/copyright +++ /dev/null @@ -1,32 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: nu -Source: https://github.com/nushell/nushell - -Files: * -Copyright: 2019 Yehuda Katz - 2019 Jonathan Turner -License: MIT - -Files: debian/* -Copyright: 2019 Yehuda Katz - 2019 Jonathan Turner -License: MIT - -License: MIT - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/install b/debian/install deleted file mode 100644 index e9ebfc1232..0000000000 --- a/debian/install +++ /dev/null @@ -1,11 +0,0 @@ -target/release/nu usr/bin -target/release/nu_plugin_binaryview usr/bin -target/release/nu_plugin_edit usr/bin -target/release/nu_plugin_inc usr/bin -target/release/nu_plugin_skip usr/bin -target/release/nu_plugin_str usr/bin -target/release/nu_plugin_sum usr/bin -target/release/nu_plugin_sys usr/bin -target/release/nu_plugin_textview usr/bin -target/release/nu_plugin_tree usr/bin -target/release/nu_plugin_docker usr/bin diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 861d76811d..0000000000 --- a/debian/postinst +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash - -if [ "$1" = configure ] && which add-shell >/dev/null -then - add-shell /usr/bin/nu -fi - -exit 0 diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 1e4655c7be..0000000000 --- a/debian/postrm +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade|failed-upgrade|abort-install|abort-upgrade) - ;; - remove|purge|disappear) - if which remove-shell >/dev/null && [ -f /etc/shells ]; then - remove-shell /usr/bin/nu - fi - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e1c367c123..0000000000 --- a/debian/rules +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - -%: - dh $@ - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d82..0000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 91ad879599..0000000000 --- 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 9a06b38e25..0000000000 --- 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 a9040d2900..0000000000 --- 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 6191b5f04c..0000000000 --- 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 42768fc08c..0000000000 --- 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 a2ad90b6bb..0000000000 --- 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 574a3b485a..0000000000 --- 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 4990e38b42..0000000000 --- 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. - - -* File debian/changelog file should be generated based on git history. - - -* Building package and nu version should be parametrized. -