diff --git a/CHANGELOG.md b/CHANGELOG.md index c02675091..1a599627c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,11 +24,29 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) - --> -## [Unreleased](https://github.com/cyverse/atmosphere/compare/v37-0...HEAD) - YYYY-MM-DD +## [Unreleased](https://github.com/cyverse/atmosphere/compare/v37-1...HEAD) - YYYY-MM-DD +## []() - +### Added + - + +### Changed + - moved apt-get remove with other apt commands in Dockerfile + +### Deprecated + - + +### Removed + - removed atmosphere-ansible from Dockerfile + +### Fixed + - + +### Security + - -## [v37-0](https://github.com/cyverse/atmosphere/compare/v36-9...v37-0) - 2020-08-13 +## [v37-0](https://github.com/cyverse/atmosphere/compare/v36-9...v37-1) - 2020-08-13 ### Added - script to create access token for users ([#744](https://github.com/cyverse/atmosphere/pull/744)) diff --git a/Dockerfile b/Dockerfile index aceda51e4..8116f5cf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,7 @@ RUN apt-get update && \ uwsgi \ uwsgi-plugin-python \ zlib1g-dev && \ + apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ locale-gen en_US.UTF-8 @@ -57,7 +58,6 @@ RUN mkdir /opt/env && \ pip install --upgrade pip==9.0.3 virtualenv &&\ virtualenv /opt/env/atmosphere &&\ ln -s /opt/env/atmosphere/ /opt/env/atmo -RUN git clone --depth 1 https://github.com/cyverse/atmosphere-ansible.git /opt/dev/atmosphere-ansible COPY . /opt/dev/atmosphere WORKDIR /opt/dev/atmosphere @@ -75,10 +75,6 @@ RUN mkdir -p /etc/uwsgi/apps-available /etc/uwsgi/apps-enabled && \ RUN source /opt/env/atmo/bin/activate && pip install -r requirements.txt -# Cleanup -RUN apt-get autoremove -y && \ - rm -rf /var/lib/apt/lists/* - RUN useradd user # Prepare entrypoint