Checkbox Core

Merge ~sylvain-pineau/checkbox-core-snap:add-apache2-utils into checkbox-core-snap:master

  1. Git
  2. lp:~sylvain-pineau/checkbox-core-snap
  3. add-apache2-utils
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Chris Wayne
Approved revision: 541786210ae139e4a1797cfecab48395c79dbd01
Merged at revision: 5be0b831bdad4f9c7de94b3758d46830d6f990cd
Proposed branch: ~sylvain-pineau/checkbox-core-snap:add-apache2-utils
Merge into: checkbox-core-snap:master
Diff against target: 13 lines (+2/-0)
1 file modified
snap/snapcraft.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+386498@code.launchpad.net

Description of the change

A prerequisite to fix the docker registry test, the call to htpasswd must now be done outside the container since the binary got removed in the most recent version of the container.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

+1, looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index bf99eff..8a04a6d 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -326,6 +326,8 @@ parts:
6 source-depth: 1
7 plugin: python
8 source: git://git.launchpad.net/plainbox-provider-docker
9+ stage-packages:
10+ - apache2-utils
11 after: [plainbox-provider-ipdt]
12 override-build: |
13 provider_path=""

Subscribers

People subscribed via source and target branches