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

Prettify images description file #46

Merged
merged 2 commits into from
May 10, 2020
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
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime


## Use unicode
RUN apt update && apt-get -y install locales && \
RUN apt-get update && apt-get -y install locales && \
locale-gen en_US.UTF-8 || true
ENV LANG=en_US.UTF-8

## Install dependencies
RUN apt update && apt-get install --no-install-recommends -y \
RUN apt-get update && apt-get install --no-install-recommends -y \
openjdk-11-jdk \
git \
wget \
Expand All @@ -23,7 +23,7 @@ RUN apt update && apt-get install --no-install-recommends -y \
python

## Clean dependencies
RUN apt clean
RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/*

## Install rbenv
Expand Down
33 changes: 16 additions & 17 deletions desc/desc.sh
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
#!/bin/sh

echo "apt packages:"
apt list --installed
echo "## Image environment"
cat /etc/*-release
echo

echo "rbenv:"
rbenv -v
echo "## Android environment"
echo "### Android SDKs"
sdkmanager --list --sdk_root=$ANDROID_HOME |
awk '/Installed packages:/{flag=1; next} /Available Packages/{flag=0} flag'
echo "### Google Cloud SDK"
gcloud --version
echo

echo "Default ruby version:"
ruby -v
echo "## APT packages"
dpkg -l
echo

echo "Installed gems:"
echo "## Ruby environment"
echo "### Default ruby version"
ruby -v
echo "### rbenv"
rbenv -v
echo "### Installed gems:"
gem list
echo

echo "gcloud env:"
gcloud --version
echo

echo "Android env:"
sdkmanager --sdk_root=$ANDROID_HOME --list
echo