diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 000000000..0307199bf --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,57 @@ +name: Docker Image CI + +on: + push: + branches: [ feature/enhancements ] +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Docker login Docker Build Docker Push + id: create-docker-image + env: + DOCKER_USER: ${{secrets.DOCKER_USER}} + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + DOCKER_REGISTRY: ${{secrets.DOCKER_REGISTRY}} + DOCKER_REPOSITORY: ${{secrets.DOCKER_REPOSITORY}} + ECS_TASK_DEFINITION: ${{secrets.ECS_TASK_DEFINITION}} + GIT_HASH: ${{ github.sha }} + run: | + # Build a docker container and + # push it to Docker Hub so that it can + # be deployed to ECS. + docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + docker pull $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} || echo 'Cache not available' + docker build --cache-from $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} -t $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH . + docker tag $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} + docker push $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} + docker push $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH + echo "::set-output name=image::$DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH" + echo $ECS_TASK_DEFINITION > task-definition.json + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_REGION }} + + - name: Fill in the nginx image ID in the Amazon ECS task definition + id: fill-task-def + uses: aws-actions/amazon-ecs-render-task-definition@v1 + with: + task-definition: task-definition.json + container-name: ${{ secrets.CONTAINER_NAME }} + image: ${{ steps.create-docker-image.outputs.image }} + + - name: Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: ${{ steps.fill-task-def.outputs.task-definition }} + service: ${{ secrets.ECS_SERVICE }} + cluster: ${{ secrets.ECS_CLUSTER }} + wait-for-service-stability: true \ No newline at end of file diff --git a/app/Http/Controllers/FilterController.php b/app/Http/Controllers/FilterController.php index e0ca3d491..0e9f51e63 100644 --- a/app/Http/Controllers/FilterController.php +++ b/app/Http/Controllers/FilterController.php @@ -1,5 +1,6 @@ sprintf($descp, $title), ]; $showCountry = true; - return view( 'site.groupDemo', compact( diff --git a/app/Http/Services/APIService.php b/app/Http/Services/APIService.php index e65a47001..bc4db4776 100644 --- a/app/Http/Services/APIService.php +++ b/app/Http/Services/APIService.php @@ -263,7 +263,6 @@ public function filterRecentSearch($filter) { extract($filter); $per_page = !empty($per_page) ? $per_page : 25; - redirectIfOldAnnotationCategory($annotation_category); $query = [ @@ -287,13 +286,11 @@ public function filterRecentSearch($filter) 'annotated' => $annotated, ]; - if ($filter['download']) { $this->downloadAPI('contracts/search', $query); } $contract = $this->apiCall('contracts/recent', $query); - if ($contract) { return $contract; } @@ -312,7 +309,6 @@ public function filterGroupSearch($filter) { extract($filter); $per_page = !empty($per_page) ? $per_page : 25; - redirectIfOldAnnotationCategory($annotation_category); $query = [ diff --git a/app/Http/Services/LocalizationService.php b/app/Http/Services/LocalizationService.php index 05639327f..8eb3648a3 100644 --- a/app/Http/Services/LocalizationService.php +++ b/app/Http/Services/LocalizationService.php @@ -3,6 +3,7 @@ use App\Http\Services\Admin\OptionService; use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; use Illuminate\Translation\Translator; /** @@ -81,8 +82,13 @@ public function getLanguage($lang = null) $browserLang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : ''; - if (!isset($_COOKIE[$this->key]) && array_key_exists($browserLang, $availableLang)) { + if(is_int($browserLang)||is_string($browserLang)) { + if (!isset($_COOKIE[$this->key]) && array_key_exists($browserLang, $availableLang)) { $lang = $browserLang; + } + } else { + Log::warning("INVALID HTTP_ACCEPT_LANGUAGE"); + Log::warning(json_encode($browserLang)); } if (is_null($lang)) { diff --git a/resources/views/contract/detail.blade.php b/resources/views/contract/detail.blade.php index d2f483197..3f16325bb 100644 --- a/resources/views/contract/detail.blade.php +++ b/resources/views/contract/detail.blade.php @@ -155,7 +155,7 @@ @if(isset($contract->metadata->contract_type) && !empty($contract->metadata->contract_type) && is_array($contract->metadata->contract_type)) @foreach($contract->metadata->contract_type as $contractype) - $contractype])}}">{{_l('codelist/contract_type',$contractype) }} + $contractype])}}">{{_l('codelist/contract_type',$contractype) }} @endforeach @endif @@ -255,7 +255,7 @@ class="view-annotation disabled">@if(site()->isRCCategorySite()) @lang('gl
  • @if(isset($company->company->name) && !empty($company->company->name)) $company->company->name])}}">{{$company->company->name}} @else + href="{{route("search/group",['company_name'=>$company->company->name])}}">{{$company->company->name}} @else - @endif
  • @@ -295,7 +295,7 @@ class="view-annotation disabled">@if(site()->isRCCategorySite()) @lang('gl @if(isset($company->company->corporate_grouping) && !empty($company->company->corporate_grouping)) - $company->company->corporate_grouping])}}">{{$company->company->corporate_grouping}} @else - diff --git a/resources/views/country/detail.blade.php b/resources/views/country/detail.blade.php index 090a6898e..bd53905da 100644 --- a/resources/views/country/detail.blade.php +++ b/resources/views/country/detail.blade.php @@ -28,7 +28,7 @@
    -
    +
    @foreach($resources as $resource)
  • - resource)}}">{{_l("resources",$resource->resource)}} + resource)}}">{{_l("resources",$resource->resource)}} {{$resource->contract}}
    • @endforeach diff --git a/resources/views/resource/detail.blade.php b/resources/views/resource/detail.blade.php index 3608340d0..fa7e72776 100644 --- a/resources/views/resource/detail.blade.php +++ b/resources/views/resource/detail.blade.php @@ -18,7 +18,7 @@
    - +
    @foreach($countries as $country)
  • - code)}}">{{trans('country')[strtoupper(ucfirst($country->code))]}} + code)}}">{{trans('country')[strtoupper(ucfirst($country->code))]}} {{$country->contract}}
    • @endforeach diff --git a/resources/views/site/filter.blade.php b/resources/views/site/filter.blade.php index de525346d..81da93962 100644 --- a/resources/views/site/filter.blade.php +++ b/resources/views/site/filter.blade.php @@ -1,3 +1,8 @@ + @extends('layout.app-full') @section('content') diff --git a/resources/views/site/home-country.blade.php b/resources/views/site/home-country.blade.php index eda0af52c..40c61eb67 100644 --- a/resources/views/site/home-country.blade.php +++ b/resources/views/site/home-country.blade.php @@ -30,7 +30,7 @@ class="pull-left trigger">
    {!! site()->meta('tagline') !!}
    - +
    @@ -40,7 +40,7 @@ class="pull-left trigger">
    - @lang('global.advanced_search') + @lang('global.advanced_search')