Skip to content

Commit

Permalink
Only use contrib source for Jessie
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Heucke <tyler.heucke@dell.com>
  • Loading branch information
heucke authored and Tyler Heucke committed Jun 18, 2018
1 parent 70d2799 commit 4b797b7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN gpg --import /usr/share/keyrings/debian-archive-keyring.gpg \
RUN mkdir -p /etc/apt/sources.list.d/ \
&& echo "deb http://deb.openswitch.net/$DIST unstable main opx opx-non-free" >>/etc/apt/sources.list.d/opx.list \
&& echo "deb-src http://deb.openswitch.net/$DIST unstable opx" >>/etc/apt/sources.list.d/opx.list \
&& echo "deb http://deb.openswitch.net/contrib stable contrib" >>/etc/apt/sources.list.d/opx.list \
&& apt-get -qq update

# Set up for the user we will create at runtime
Expand Down
13 changes: 8 additions & 5 deletions assets/hook.d/D05update-sources
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
#!/bin/bash -e
# Update package sources

cat <<EOF >/etc/apt/sources.list.d/opx.list
deb http://deb.openswitch.net/$DIST $OPX_RELEASE main opx opx-non-free
deb http://deb.openswitch.net/contrib stable contrib
EOF
echo "deb http://deb.openswitch.net/$DIST $OPX_RELEASE main opx opx-non-free" \
>> /etc/apt/sources.list.d/opx.list

if [[ "$DIST" == "jessie" ]]; then
echo "deb http://deb.openswitch.net/contrib stable contrib" \
>> /etc/apt/sources.list.d/opx.list
fi

if [[ "$OPX_RELEASE" =~ ^(unstable|testing|stable)$ ]]; then
echo "deb-src http://deb.openswitch.net/$DIST $OPX_RELEASE opx" \
>>/etc/apt/sources.list.d/opx.list
fi

apt-get update
apt-get -qq update

0 comments on commit 4b797b7

Please sign in to comment.