K8s Content Cache Charm

Merge ~hloeung/charm-k8s-content-cache/+git/content-cache-k8s-image-builder:master into ~hloeung/charm-k8s-content-cache:master

  1. Git
  2. lp:~hloeung/charm-k8s-content-cache/+git/content-cache-k8s-image-builder
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Merged at revision: 2cc354cbad2a6a627d116e00f813b0947699918e
Proposed branch: ~hloeung/charm-k8s-content-cache/+git/content-cache-k8s-image-builder:master
Merge into: ~hloeung/charm-k8s-content-cache:master
Diff against target: 48 lines (+19/-0) (has conflicts)
3 files modified
.gitignore (+3/-0)
README.md (+4/-0)
docker/Dockerfile (+12/-0)
Conflict in .gitignore
Conflict in README.md
Reviewer Review Type Date Requested Status
Content Cache Charmers Pending
Review via email: mp+390210@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 9f65e64..5ea2462 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,6 +1,9 @@
6 *~
7+<<<<<<< .gitignore
8 *.charm
9 .coverage
10 .tox
11 build/
12 __pycache__/
13+=======
14+>>>>>>> .gitignore
15diff --git a/README.md b/README.md
16index aabaf43..bc57c70 100644
17--- a/README.md
18+++ b/README.md
19@@ -1,3 +1,4 @@
20+<<<<<<< README.md
21 # charm-k8s-content-cache
22
23 ## Description
24@@ -26,3 +27,6 @@ and install the development requirements,
25 Just run `run_tests`:
26
27 ./run_tests
28+=======
29+# Content Cache Docker
30+>>>>>>> README.md
31diff --git a/docker/Dockerfile b/docker/Dockerfile
32new file mode 100644
33index 0000000..1d9ebed
34--- /dev/null
35+++ b/docker/Dockerfile
36@@ -0,0 +1,12 @@
37+FROM ubuntu:focal
38+
39+# We use "set -o pipefail"
40+SHELL ["/bin/bash", "-c"]
41+
42+ENV LANG C.UTF-8
43+ENV DEBIAN_FRONTEND noninteractive
44+
45+RUN apt-get -qy update && \
46+ apt-get -qy dist-upgrade --no-install-recommends && \
47+ apt-get -qy install --no-install-recommends nginx && \
48+ rm -f /var/lib/apt/lists/*_*

Subscribers

People subscribed via source and target branches

to all changes: