From 8edccefb88c6eee8de03c5421506dbc41f9f0188 Mon Sep 17 00:00:00 2001
From: Gabriel Diaz <gabo.fdc@gmail.com>
Date: Wed, 23 Dec 2020 15:40:55 -0500
Subject: [PATCH] Fix rakudo promote to alpine edge community repo and update
 phive dependencies (#1099)

* Fix rakudo promote to alpine edge community repo

* Update phive dependencies
---
 Dockerfile             | 28 ++++++++++++++--------------
 dependencies/phive.xml |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5be455ef..df319f17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,19 +38,19 @@ ARG BUILD_VERSION
 # Label the instance and set maintainer #
 #########################################
 LABEL com.github.actions.name="GitHub Super-Linter" \
-      com.github.actions.description="Lint your code base with GitHub Actions" \
-      com.github.actions.icon="code" \
-      com.github.actions.color="red" \
-      maintainer="GitHub DevOps <github_devops@github.com>" \
-      org.opencontainers.image.created=$BUILD_DATE \
-      org.opencontainers.image.revision=$BUILD_REVISION \
-      org.opencontainers.image.version=$BUILD_VERSION \
-      org.opencontainers.image.authors="GitHub DevOps <github_devops@github.com>" \
-      org.opencontainers.image.url="https://github.com/github/super-linter" \
-      org.opencontainers.image.source="https://github.com/github/super-linter" \
-      org.opencontainers.image.documentation="https://github.com/github/super-linter" \
-      org.opencontainers.image.vendor="GitHub" \
-      org.opencontainers.image.description="Lint your code base with GitHub Actions"
+    com.github.actions.description="Lint your code base with GitHub Actions" \
+    com.github.actions.icon="code" \
+    com.github.actions.color="red" \
+    maintainer="GitHub DevOps <github_devops@github.com>" \
+    org.opencontainers.image.created=$BUILD_DATE \
+    org.opencontainers.image.revision=$BUILD_REVISION \
+    org.opencontainers.image.version=$BUILD_VERSION \
+    org.opencontainers.image.authors="GitHub DevOps <github_devops@github.com>" \
+    org.opencontainers.image.url="https://github.com/github/super-linter" \
+    org.opencontainers.image.source="https://github.com/github/super-linter" \
+    org.opencontainers.image.documentation="https://github.com/github/super-linter" \
+    org.opencontainers.image.vendor="GitHub" \
+    org.opencontainers.image.description="Lint your code base with GitHub Actions"
 
 #################################################
 # Set ENV values used for debugging the version #
@@ -276,7 +276,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
 # Install Raku and additional Edge dependencies #
 #################################################
 # Basic setup, programs and init
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories \
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repositories \
     && apk add --no-cache rakudo zef
 
 ######################
diff --git a/dependencies/phive.xml b/dependencies/phive.xml
index 8d1b31d4..0a33fa88 100644
--- a/dependencies/phive.xml
+++ b/dependencies/phive.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <!-- When adding new linter, do not forget to add its GPG key ID to Dockerfile -->
-  <phar name="phpcs" version="^3.5" installed="3.5.5" location="/usr/local/bin/phpcs" copy="true"/>
-  <phar name="phpstan" version="^0.12" installed="0.12.34" location="/usr/local/bin/phpstan" copy="true"/>
-  <phar name="psalm" version="^3.12" installed="3.12.2" location="/usr/local/bin/psalm" copy="true"/>
+  <phar name="phpcs" version="^3.5" installed="3.5.8" location="/usr/local/bin/phpcs" copy="true"/>
+  <phar name="phpstan" version="^0.12" installed="0.12.64" location="/usr/local/bin/phpstan" copy="true"/>
+  <phar name="psalm" version="^3.12" installed="3.18.2" location="./usr/local/bin/psalm" copy="true"/>
 </phive>