Skip to content
This repository has been archived by the owner on Apr 1, 2022. It is now read-only.

Commit

Permalink
(#17) Fix dbus warnings and do some renames:
Browse files Browse the repository at this point in the history
* Add `dialog`;
* Rename files;
* Put package names in quotation marks;
* Don't set a value for `DEBIAN_FRONTEND` in the end.
  • Loading branch information
Pavel Sobolev authored Aug 17, 2020
1 parent f64adef commit 6f60df0
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 34 deletions.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
- develop

jobs:
update:
Update:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Get release version
run: bash .github/scripts/PublishDocker.bash
run: bash .github/scripts/publish-docker.bash

- name: Publish to Registry (with a tagged image)
if: ${{ env.PUBLISH_RELEASE_VERSION == 'true' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop

jobs:
update:
Update:
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
include:
- stage: "Build"
name: "Build Docker Image"
script: bash .github/scripts/Build.bash
script: bash .github/scripts/build.bash

notifications:
email: false
15 changes: 6 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ FROM ubuntu:20.04

# Meta information
LABEL maintainer="Pavel Sobolev (https://github.com/Paveloom)"
LABEL version="0.1.0"
LABEL version="0.1.1"
LABEL description="This image contains a base for Binder."
LABEL github-repository="https://github.com/paveloom-d/binder-base"
LABEL docker-repository="https://hub.docker.com/r/paveloom/binder-base"

# Copy scripts to the root
# Copy the scripts to the root
COPY scripts /scripts

# Allow their execution
Expand All @@ -23,7 +23,7 @@ RUN /scripts/root/essential-packages/install-essential-packages.sh
# Specify a new user
ENV USER=jovyan

# Set HOME for this user
# Set `HOME` for this user
ENV HOME /home/$USER

# Set up a new user
Expand All @@ -41,14 +41,11 @@ USER $USER
# Switch to the home directory of this user
WORKDIR $HOME

# Add ~/.local/bin to the PATH
# Add `~/.local/bin` to the `PATH`
ENV PATH=$PATH:$HOME/.local/bin

# Install JupyterLab
# Install Jupyter
RUN /scripts/user/jupyterlab/install-jupyterlab.sh

# Remove scripts
RUN sudo rm -rf /scripts

# Set DEBIAN_FRONTEND to teletype
ENV DEBIAN_FRONTEND=teletype
RUN sudo rm -rf /scripts
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Well, a couple more packages you'll probably need. See below for a full list.
<ul>
<li>apt-utils</li>
<li>apt-transport-https</li>
<li>dialog</li>
<li>ca-certificates</li>
<li>git</li>
<li>nano</li>
Expand Down Expand Up @@ -77,6 +78,7 @@ FROM paveloom/binder-base:tag

where the `tag` is one of the following:

* [0.1.1](https://github.com/paveloom-d/binder-base/releases/tag/v0.1.1)
* [0.1.0](https://github.com/paveloom-d/binder-base/releases/tag/v0.1.0)

### Can I easily see what it looks like?
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Base image
FROM paveloom/binder-base:0.1.0
FROM paveloom/binder-base:0.1.1
21 changes: 12 additions & 9 deletions scripts/root/essential-packages/install-essential-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,34 @@ echo '\n\e[1;36mInstalling essential packages:\e[0m'
echo '\e[1;36m> Updating lists of packages...\e[0m'
apt-get update >/dev/null

echo '\e[1;36m> Installing apt-utils...\e[0m'
echo '\e[1;36m> Installing `apt-utils`...\e[0m'
apt-get -y install apt-utils >/dev/null 2>&1

echo '\e[1;36m> Installing apt-transport-https...\e[0m'
echo '\e[1;36m> Installing `apt-transport-https`...\e[0m'
apt-get install -y --no-install-recommends apt-transport-https >/dev/null

echo '\e[1;36m> Installing ca-certificates...\e[0m'
echo '\e[1;36m> Installing `ca-certificates`...\e[0m'
apt-get install -y --no-install-recommends ca-certificates >/dev/null

echo '\e[1;36m> Installing git...\e[0m'
echo '\e[1;36m> Installing `dialog`...\e[0m'
apt-get install -y --no-install-recommends dialog >/dev/null

echo '\e[1;36m> Installing `git`...\e[0m'
apt-get install -y --no-install-recommends git >/dev/null

echo '\e[1;36m> Installing wget...\e[0m'
echo '\e[1;36m> Installing `wget`...\e[0m'
apt-get install -y --no-install-recommends wget >/dev/null

echo '\e[1;36m> Installing sudo...\e[0m'
echo '\e[1;36m> Installing `sudo`...\e[0m'
wget --no-check-certificate https://github.com/sudo-project/sudo/releases/download/SUDO_1_9_1/sudo_1.9.1-1_ubu2004_amd64.deb >/dev/null 2>&1
apt-get -y install ./sudo_1.9.1-1_ubu2004_amd64.deb >/dev/null
rm sudo_1.9.1-1_ubu2004_amd64.deb

echo '\e[1;36m> Installing ssh...\e[0m'
echo '\e[1;36m> Installing `ssh`...\e[0m'
apt-get install -y --no-install-recommends ssh >/dev/null

echo '\e[1;36m> Installing software-properties-common...\e[0m'
echo '\e[1;36m> Installing `software-properties-common`...\e[0m'
apt-get install -y --no-install-recommends software-properties-common >/dev/null

echo '\e[1;36m> Cleaning the apt cache...\e[0m\n'
echo '\e[1;36m> Cleaning the `apt` cache...\e[0m\n'
rm -rf /var/lib/apt/lists/*
6 changes: 3 additions & 3 deletions scripts/root/nodejs-and-npm/install-nodejs-and-npm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ echo '\n\e[1;36mInstalling Node.js and npm:\e[0m'
echo '\e[1;36m> Updating lists of packages...\e[0m'
apt-get update >/dev/null

echo '\e[1;36m> Installing Node.js...\e[0m'
echo '\e[1;36m> Installing `nodejs`...\e[0m'
apt-get install -y --no-install-recommends nodejs >/dev/null

echo '\e[1;36m> Installing npm...\e[0m'
echo '\e[1;36m> Installing `npm`...\e[0m'
apt-get install -y --no-install-recommends npm >/dev/null

echo '\e[1;36m> Cleaning the apt cache...\e[0m\n'
echo '\e[1;36m> Cleaning the `apt` cache...\e[0m\n'
rm -rf /var/lib/apt/lists/*
6 changes: 3 additions & 3 deletions scripts/root/python/install-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ echo '\n\e[1;36mInstalling Python:\e[0m'
echo '\e[1;36m> Updating lists of packages...\e[0m'
apt-get update >/dev/null

echo '\e[1;36m> Installing python3-dev...\e[0m'
echo '\e[1;36m> Installing `python3-dev`...\e[0m'
apt-get install -y --no-install-recommends python3-dev >/dev/null

echo '\e[1;36m> Installing python3-pip...\e[0m'
echo '\e[1;36m> Installing `python3-pip`...\e[0m'
apt-get install -y --no-install-recommends python3-pip >/dev/null

echo '\e[1;36m> Cleaning the apt cache...\e[0m\n'
echo '\e[1;36m> Cleaning the `apt` cache...\e[0m\n'
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion scripts/root/user/set-up-a-new-user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ useradd -u 1000 -ms /bin/bash $USER
echo '\e[1;36m> Disabling password prompt...\e[0m'
echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER

echo '\e[1;36m> Setting read only mode for /etc/sudoers.d/$USER...\e[0m'
echo '\e[1;36m> Setting read only mode for `/etc/sudoers.d/$USER`...\e[0m'
chmod 0440 /etc/sudoers.d/$USER

echo '\e[1;36m> Letting the user to own home directory...\e[0m\n'
Expand Down
8 changes: 4 additions & 4 deletions scripts/user/jupyterlab/install-jupyterlab.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/sh

echo '\n\e[1;36mInstalling JupyterLab:\e[0m'
echo '\n\e[1;36mInstalling Jupyter:\e[0m'

echo '\e[1;36m> Installing jupyter...\e[0m'
echo '\e[1;36m> Installing `jupyter`...\e[0m'
pip3 install --no-cache-dir jupyter >/dev/null

echo '\e[1;36m> Installing jupyterlab...\e[0m'
echo '\e[1;36m> Installing `jupyterlab`...\e[0m'
pip3 install --no-cache-dir jupyterlab >/dev/null

echo '\e[1;36m> Installing jupyter-offlinenotebook...\e[0m'
echo '\e[1;36m> Installing `jupyter-offlinenotebook`...\e[0m'
pip3 install --no-cache-dir jupyter-offlinenotebook >/dev/null
jupyter labextension install jupyter-offlinenotebook >/dev/null 2>&1

Expand Down

0 comments on commit 6f60df0

Please sign in to comment.