Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
65e06bea
Commit
65e06bea
authored
Nov 23, 2016
by
Feanil Patel
Committed by
GitHub
Nov 23, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3483 from edx/feanil/ecommerce_16.04_ami
Move docker to 16.04 for the ecommerce app.
parents
037ca98d
a5e58b6f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
docker.mk
+1
-1
docker/build/ecommerce/Dockerfile
+1
-1
docker/build/precise-common/Dockerfile
+8
-0
docker/build/xenial-common/Dockerfile
+8
-0
No files found.
docker.mk
View file @
65e06bea
...
...
@@ -49,7 +49,7 @@ $(docker_pkg)%: .build/%/Dockerfile.pkg
docker build
-t
$*
:latest
-f
$<
.
$(docker_push)%
:
$(docker_pkg)%
docker tag
-f
$*
:latest edxops/
$*
:latest
docker tag
$*
:latest edxops/
$*
:latest
docker push edxops/
$*
:latest
...
...
docker/build/ecommerce/Dockerfile
View file @
65e06bea
FROM
edxops/
precise
-common:latest
FROM
edxops/
xenial
-common:latest
MAINTAINER
edxops
RUN
apt-get update
...
...
docker/build/precise-common/Dockerfile
View file @
65e06bea
FROM
ubuntu:precise
MAINTAINER
edxops
# Set locale to UTF-8 which is not the default for docker.
# See the links for details:
# http://jaredmarkell.com/docker-and-locales/
# https://github.com/docker-library/python/issues/13
# https://github.com/docker-library/python/pull/14/files
ENV
LANG C.UTF-8
ENV
ANSIBLE_REPO="https://github.com/edx/ansible"
ENV
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
...
...
docker/build/xenial-common/Dockerfile
View file @
65e06bea
FROM
ubuntu:xenial
MAINTAINER
edxops
# Set locale to UTF-8 which is not the default for docker.
# See the links for details:
# http://jaredmarkell.com/docker-and-locales/
# https://github.com/docker-library/python/issues/13
# https://github.com/docker-library/python/pull/14/files
ENV
LANG C.UTF-8
ENV
ANSIBLE_REPO="https://github.com/edx/ansible"
ENV
CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV
CONFIGURATION_VERSION="master"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment