Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
c8b87203
Commit
c8b87203
authored
Mar 31, 2016
by
jackgr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge error
parent
6f884910
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
2 deletions
+0
-2
Dockerfile
rootfs/manager/Dockerfile
+0
-1
Dockerfile
rootfs/resourcifier/Dockerfile
+0
-1
No files found.
rootfs/manager/Dockerfile
View file @
c8b87203
...
...
@@ -13,7 +13,6 @@
# limitations under the License.
FROM
alpine:3.3
RUN
apk
--update
add ca-certificates
COPY
. /
# Install CA certs
...
...
rootfs/resourcifier/Dockerfile
View file @
c8b87203
...
...
@@ -13,7 +13,6 @@
# limitations under the License.
FROM
alpine:3.3
RUN
apk
--update
add ca-certificates
COPY
. /
# Install CA certs
...
...
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